merge of '9b6cdd024207fb27c1273c341b1610c554f948e9'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 21:40:17 +0000 (21:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 21:40:17 +0000 (21:40 +0000)
     and 'a8e71f07bc5697f18dc65c9774d84f92706d66b8'


Trivial merge