merge of '434de93cfa2e4d34e3f4a19e5bff6130398e5d8f'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 20:06:47 +0000 (20:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 20:06:47 +0000 (20:06 +0000)
commitaef114162d66ed9f45e616b631701b988dc95137
tree0c3a55965ac0f15b851aaee90f4e903b1401cc48
parent389c8d10471156957f80965943072ec225011c28
parente42444af451f1c20f816d8c5148ae9d94fc6f8a4
Merge ... '434de93cfa2e4d34e3f4a19e5bff6130398e5d8f'
     and '43c38f4dda9e1b6f193bd92c89479423586dbe59'