merge of '1d05bbd701cd09434dbcc309dc00e37c3f1e2b54'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jun 2007 10:47:22 +0000 (10:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jun 2007 10:47:22 +0000 (10:47 +0000)
     and 'd56afe7fa243cd0f2feab2dd537cc8dbfe1d91fc'


Trivial merge