merge of 'b805c5a50c8090844ec5ef1b84d102464acb782d'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:22:07 +0000 (19:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:22:07 +0000 (19:22 +0000)
     and 'b875e862e2ccb0103de09d87184dc882abb4a8ad'


Trivial merge