merge of '6effd4b98afa326e66d32ef10490967c420727f4'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 16:56:55 +0000 (16:56 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 16 Jul 2008 16:56:55 +0000 (16:56 +0000)
     and 'd081501ea9f95cb4ffb0c033c9a4f1b0cef84220'


Trivial merge