merge of '91b1890c469c39d7efcba63967f106bf6efd0c4f'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 13:47:03 +0000 (13:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 13:47:03 +0000 (13:47 +0000)
commit3e5c600bfffcbfea69f1dc0ae2016a1b9169b413
tree1c2e5a5f719464aca6a6bbcc5d13c0f2c3fe61cc
parent8848c042c71ab3e7951808451ff827e9a3a4d2a2
parent69e79e419a03961aef7acbe99c101d74e4f89680
Merge ... '91b1890c469c39d7efcba63967f106bf6efd0c4f'
     and 'ce9648eef13f1ef5d8dff88dc64af875993364e9'