merge of '375a27e2a1e696f0e3ebd6e8faf905bae63a016c'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 19:12:31 +0000 (19:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 16 Oct 2007 19:12:31 +0000 (19:12 +0000)
commit74ebe9303c9cd0ed2f74373c601c75f67d87cb92
treeb36943f3664f25c102f95d9d90e0001639676909
parentd4a39a9491b84814286f0816819bc048ba9d7e68
parent18c19924d9f122019aa6380903a54645c2e50570
Merge ... '375a27e2a1e696f0e3ebd6e8faf905bae63a016c'
     and '5e37b755f10936f81113606e76957fb837b04eda'