merge of 80d921d4eb948d68b2d65a3d93db120eae996016
authorMichael Lauer <mickey@vanille-media.de>
Sat, 25 Nov 2006 18:54:48 +0000 (18:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 25 Nov 2006 18:54:48 +0000 (18:54 +0000)
commitfe4d9f421f55201f505268a2256f92f1efc30fd5
treed52ad9f76d832901291f172dfd2784f7c0ce9f78
parentc41aad22aeb0e6b7c15a36f66ae0f33eaf8077c9
parent997843c6525cd822db1a1c3274171b2a89bb13a4
merge of 80d921d4eb948d68b2d65a3d93db120eae996016
     and 8f3baeb5bf49c339b2cc784f9f4abed635cc720e