merge of '77e6de1879d8cb9e2cedcd283c5c43e8c333cc65'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 1 May 2008 10:29:54 +0000 (10:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 1 May 2008 10:29:54 +0000 (10:29 +0000)
commitde1d1324ccbf439e1902ed7e975642dbcdd7beb8
tree1d8ee911f79d7dd24d377dd0bf4619699c253120
parent3338a47c2494662ce4e277c7215c1584ec6b0f53
parent158d2f97769e0a22db98f1e39a6bd6fb7ccb627a
Merge ... '77e6de1879d8cb9e2cedcd283c5c43e8c333cc65'
     and 'a73b62bfa46dd3bec609e1b1307c59a93f4a4469'