Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Fri, 17 Jun 2011 21:11:20 +0000 (23:11 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Fri, 17 Jun 2011 21:11:20 +0000 (23:11 +0200)

Trivial merge