merge of '3289b5a802bb36f84f72d159c65ca3869e90041e'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 21 Aug 2007 15:18:13 +0000 (15:18 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 21 Aug 2007 15:18:13 +0000 (15:18 +0000)
     and '5ee4afc833aaf754d4605b6c97860c3016037b3e'


Trivial merge