Merge branch 'cmake'
authorManuel Nickschas <sputnick@quassel-irc.org>
Sun, 15 Jun 2008 00:39:17 +0000 (02:39 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Sun, 15 Jun 2008 00:39:17 +0000 (02:39 +0200)

Trivial merge