Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Wed, 8 Jun 2011 20:33:43 +0000 (22:33 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Wed, 8 Jun 2011 20:33:43 +0000 (22:33 +0200)

Trivial merge