Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 22 Jun 2011 13:32:06 +0000 (15:32 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 22 Jun 2011 13:32:06 +0000 (15:32 +0200)

Trivial merge