merge of 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 12 Apr 2008 22:30:21 +0000 (22:30 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 12 Apr 2008 22:30:21 +0000 (22:30 +0000)
     and 'a6bf1374bee35f1cd9cae388f5137b3d0647f2af'


Trivial merge