Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Fri, 3 Jun 2011 19:51:38 +0000 (21:51 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Fri, 3 Jun 2011 19:51:38 +0000 (21:51 +0200)

Trivial merge