merge of '83df338c70f7f4819197794f3daebb64a89fcf0a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 02:50:27 +0000 (02:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Oct 2008 02:50:27 +0000 (02:50 +0000)
commitbd9b29dbdf3b871551494857a121bec5009d0a4f
treeb805397e2cff37116ae4e09d20be0fa0c0a140d7
parent2d4fa9f3f3413d57ea993a3394643f60fefb2d83
parent98e90cb91c698cd3dfe808e96b3379cb539b6fa6
Merge ... '83df338c70f7f4819197794f3daebb64a89fcf0a'
     and '9f79c6b2ba1ff673c6a3fa4d02579b720046d1cf'