merge of '3d02f890a5870026e323b8fbf644e2138a51e3a3'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 13:16:42 +0000 (13:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 19 Aug 2007 13:16:42 +0000 (13:16 +0000)
     and '6f58aae892a3a9e0e720d96f036281d5c255a9a4'


Trivial merge