Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Thu, 2 Jun 2011 20:09:52 +0000 (22:09 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Thu, 2 Jun 2011 20:09:52 +0000 (22:09 +0200)

Trivial merge