merge of '7a4784a76121e6cf9b4204ebe5c812e2e540767f'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 23:07:39 +0000 (23:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 3 Sep 2008 23:07:39 +0000 (23:07 +0000)
     and 'b5b94ebf56fcb87ac967b302ae3570b7f59d3dc2'


Trivial merge