Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Tue, 7 Jun 2011 13:39:19 +0000 (15:39 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Tue, 7 Jun 2011 13:39:19 +0000 (15:39 +0200)

Trivial merge