Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 15 Jun 2011 21:25:47 +0000 (23:25 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 15 Jun 2011 21:25:47 +0000 (23:25 +0200)

Trivial merge