merge of '048900e1dc1296a50f90bf6b77b7be816922e4ac'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 23:54:15 +0000 (23:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 23:54:15 +0000 (23:54 +0000)
     and '8f046513c054e5ae4400145d7f5e0288953f7fab'


Trivial merge