Merge remote-tracking branch 'origin/cmake-conversion'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 26 Aug 2011 15:02:51 +0000 (17:02 +0200)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Fri, 26 Aug 2011 15:02:51 +0000 (17:02 +0200)

Trivial merge