merge of '8b3f99cac7b433e63ebc902c06ae99fbf39205c7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Dec 2006 17:16:54 +0000 (17:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Dec 2006 17:16:54 +0000 (17:16 +0000)
commit995a5f2d2401fdd4d7e4f7cf4517bda86a1a3e2d
tree351a77c79c8f8e9569fbf8eb5f4a33959a1aa04a
parent4aaee31f181c5be7e6c6271390524c02c89a2c90
parentadbcf06f0b4d970ee5f249d3296d9a39446e2690
Merge ... '8b3f99cac7b433e63ebc902c06ae99fbf39205c7'
     and '9d4c63819084cf385a16232369e7d698fcb6dd87'