merge of '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 23:49:17 +0000 (23:49 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 23:49:17 +0000 (23:49 +0000)
commit7607b318639c6343b6a03cec177cfe24728f0165
treeb4dbb850603295b2f4b3be159ff5ad08fe7de1fe
parent72963c237a9e150ff44a2cec6333e876935222b9
parent1bd84e0b4a622aa91157b5cf19173126a608253c
Merge ... '3c94d9db3ba91b1d4e037bacbd0bce84e35642eb'
     and 'e50fc707da1372d68e46edaf3a6915bf53f628b9'