merge of '8ed4f745361c3a5e363b7efaa73ba59ef8bc8031'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 17:54:45 +0000 (17:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 17:54:45 +0000 (17:54 +0000)
commit314d1c8d180ca954a784ab6ef51d58622ee56018
treedf5890c60ba6eaa4f20140b76b54719074dad98e
parent906baa70751285bc921c40e3ebe5964fbeac7bbf
parent3a49ef28b3a72df83df715eea7a08ef0dacceccd
Merge ... '8ed4f745361c3a5e363b7efaa73ba59ef8bc8031'
     and 'b713540faed8dc1c9b7eb055d91e3eaef321b79f'