merge of '294a7914d9ff32527dddf5266da757d7385372e7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Aug 2007 11:01:07 +0000 (11:01 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Aug 2007 11:01:07 +0000 (11:01 +0000)
commit218897f352d0bed08178a177d186f59c8c73a506
tree9effb3a35ce2889ec72e5bd649263974b11b7d65
parentf309083441acde886c432ffcb41fa06bd790f9d8
parent2edb67ce2572765431f7791bd13c17e255ff12c6
Merge ... '294a7914d9ff32527dddf5266da757d7385372e7'
     and '726f50fa46c4db4bf5fb2dc2f6390ca60337cdd0'