merge of '0b7113a85be8ed98e75a1000c58eb9ea5de39919'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jan 2008 02:08:50 +0000 (02:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 22 Jan 2008 02:08:50 +0000 (02:08 +0000)
commitf797c5d5a6af001ccd77de1750013f3fcc970c51
tree0a5f1af6cc4550a2bb5b1d332976becd99d298c7
parentd692c3dae431dc0f7efad1326baecc765bf571cb
parent44da1a0957957fe55efd6ddef775c4ec23279d77
Merge ... '0b7113a85be8ed98e75a1000c58eb9ea5de39919'
     and '43f6b35dcf8438ea9fc7e6a23fa4541225259e15'