merge of '9c56bb4603d094151503b996376d78874b9d938c'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:31 +0000 (00:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 00:40:31 +0000 (00:40 +0000)
commit9a077a5f32bdb47017f82644d134663adeab8cc5
tree4c0d0eab6226fec029d43c3c62af7caf025b9750
parentdb609dad15bffd0c11445fbb4c5d5413f7c01620
parent3c93cedf7c10f7751de0209cd33338cca8005c11
Merge ... '9c56bb4603d094151503b996376d78874b9d938c'
     and 'c8ce15d8b6944d0c337d5c2e89f0726b7dd895bf'