merge of '1543d455b98f10988b3ae9a01d9e2f61ff07e2f1'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:11:14 +0000 (19:11 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 19:11:14 +0000 (19:11 +0000)
commit5c6dcfb8dac702fe24cb8628bbd1acf5eb58e1e9
tree3fb79844a1244751c40e15e1292aa196dab8c682
parentc6ccbda2d4a75e4e171e01b1930f24248f6b8bb6
parent1715546440b7d67ba553587beecdf5e113e656a8
Merge ... '1543d455b98f10988b3ae9a01d9e2f61ff07e2f1'
     and '2450408c60daf405a9bb6b3b73d1529280dc244f'