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

Trivial merge