merge of '1c2a066fe666a7ab871c0b647aa7557802e7960c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 20 Feb 2008 17:12:37 +0000 (17:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 20 Feb 2008 17:12:37 +0000 (17:12 +0000)
     and 'abff11b5d16c4babe2a2dc6adcf2fd393aea57d1'


Trivial merge