merge of '384c03fc9086edbfe62961d2a403edd22aa3e820'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 13:23:03 +0000 (13:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 13:23:03 +0000 (13:23 +0000)
commitccb0fa55ca46cc3f1c7269e424dad1f9a94c2ac9
tree10ed5c0ccd92bd684430db80ac874bdfa5b2c7ec
parent6ff972217183579dfb996fcebe9919265fd99b19
parent97cdde9f9344eaeb369b3f3cb4dce4ec0254b5e6
Merge ... '384c03fc9086edbfe62961d2a403edd22aa3e820'
     and 'f5ea07728cfa7bdf07cae1c5d718a57488f84b6e'