merge of '3fcc49d84194b9665e260098b358d5a1848e697b'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 13:54:03 +0000 (13:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 13:54:03 +0000 (13:54 +0000)
commit3e72139bd9476307035d85b73634c920037269a5
treee4180f1ecf2bb6487585de39f21f425fa74304c4
parent0e130de26c131349596b6435e49e69cff37d59db
parent8013441436d8bef02872333da11c3668165e4bd7
Merge ... '3fcc49d84194b9665e260098b358d5a1848e697b'
     and '86f3076c176e5860f297ef5a29fdd170ade23792'