merge of '3ecc917729c94ee2f23b012b99f74a8a524154c2'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 18 Sep 2007 00:39:05 +0000 (00:39 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 18 Sep 2007 00:39:05 +0000 (00:39 +0000)
commit5a5e099bc3828e0b02b837951bf2863d1402b032
treee4933a3ccab45021cdd5c4da84a505a7529d8ed9
parent62e0b59ca67fc6f950cbc264d371f37d8d207b69
parentd89308b089c7625d06ff820234bdfea283da82fa
Merge ... '3ecc917729c94ee2f23b012b99f74a8a524154c2'
     and 'cc4ff44ab8858d40dac79ae6b3e11d75dbd68c10'