Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Tue, 31 May 2011 12:32:46 +0000 (14:32 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Tue, 31 May 2011 12:32:46 +0000 (14:32 +0200)

Trivial merge