merge of '0da4c1d1a1201b71b5bf114146f1ce3482bfc846'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 13:46:22 +0000 (13:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 13:46:22 +0000 (13:46 +0000)
     and '917b1c29f7daf7bfd184979a9b4f90fa0f1f8616'


Trivial merge