Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Sat, 28 May 2011 15:44:15 +0000 (17:44 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Sat, 28 May 2011 15:44:15 +0000 (17:44 +0200)

Trivial merge