merge of '19595382c19aadeee7dac4939deb285a05e428eb'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 3 Feb 2008 23:36:10 +0000 (23:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 3 Feb 2008 23:36:10 +0000 (23:36 +0000)
     and '31ced983465ce39a8b2be69de54096ba17a8b404'


Trivial merge