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

Trivial merge