merge of '42eff26099cde8822773944e3b244f74387ef7cc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 12:02:37 +0000 (12:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 12:02:37 +0000 (12:02 +0000)
commitfcb50855fe95922a2fc428634daa9bf9ec5aae27
tree3c1ffcd90e016c0d2e456fa94ad064a60fc52109
parent9d42c6d52697e45545f2a83dd014278c038f75ca
parent0909818c9efe45721f77eafe962035f57cf59954
Merge ... '42eff26099cde8822773944e3b244f74387ef7cc'
     and 'd2b1667a830019b8580dcf05a70b8e95329e9e25'