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

Trivial merge