Merge remote-tracking branch 'gitorious/master'
authorJef van Schendel <jefvanschendel@gmail.com>
Sat, 18 Jun 2011 23:44:26 +0000 (01:44 +0200)
committerJef van Schendel <jefvanschendel@gmail.com>
Sat, 18 Jun 2011 23:44:26 +0000 (01:44 +0200)

Trivial merge