merge of '626cf4325c0654b9580525c44fc4b4a1eef602f2'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 Jan 2007 22:47:42 +0000 (22:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 11 Jan 2007 22:47:42 +0000 (22:47 +0000)
commitcd383b749127797cc7cf9ba556c685e1c70e32ea
tree1eea5794ec6a1c5126a79305eeeff56c1f686cec
parent3bf93120faa970bf813bfceaa08054c360cc1994
parentbb77ce802e307ef58a2fe725f33ad181b025f16a
Merge ... '626cf4325c0654b9580525c44fc4b4a1eef602f2'
     and '864030c30acdb89f49bcfbd4707a4a16dcfb2b53'