merge of 2c2427ae9aeb6ca358a92e745e1051f1d06134df
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Dec 2006 10:50:15 +0000 (10:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Dec 2006 10:50:15 +0000 (10:50 +0000)
     and 65c95bf6c423272c963b3df3c62c0fcee9c7cf71


Trivial merge