Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Sat, 4 Jun 2011 00:22:09 +0000 (02:22 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Sat, 4 Jun 2011 00:22:09 +0000 (02:22 +0200)

Trivial merge