merge of '1c44ae3b4aae69a8d66c7c068c44f337bc51f559'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jan 2008 20:43:08 +0000 (20:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 28 Jan 2008 20:43:08 +0000 (20:43 +0000)
     and 'd039068c51d6eb51dd6d0bd1dd1306d490e3d527'


Trivial merge