merge of '63c7ad87655c2781ad8b9c81af430596f48a24a6'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jan 2008 19:38:53 +0000 (19:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Jan 2008 19:38:53 +0000 (19:38 +0000)
commit6cfb865779e272b26c10065995a9c7bb73ae1f37
treecefdbaaede4f788467f9f841036e9c763c0fced8
parentad3a31a6fb078325742181daf20e4d3a25890c87
parent6b3ebb8bf559069c9ed3e3d20c4d54de8e1884dc
Merge ... '63c7ad87655c2781ad8b9c81af430596f48a24a6'
     and 'bc63a4fa471a2388437163476a7cb1cf8179bb23'