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

Trivial merge