Merge remote-tracking branch 'bucket-t/master'
authorteddydestodes <derkomtur@schattengang.net>
Wed, 1 Jun 2011 12:43:27 +0000 (14:43 +0200)
committerteddydestodes <derkomtur@schattengang.net>
Wed, 1 Jun 2011 12:43:27 +0000 (14:43 +0200)

Trivial merge