merge of '4273804b598541555abb070bcb83ec503beaceff'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 17:58:05 +0000 (17:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 5 Dec 2007 17:58:05 +0000 (17:58 +0000)
commit0b65b7aa8f9d5462f9ef95e20e7be1f4dce4ee0d
treed95638170c44669e372bd71f5d7878960a756cda
parentbf12eeb7d990c04245634376a596dff6984e46fe
parent4d8180076d5e79b514e15313101448b35eaa96f1
Merge ... '4273804b598541555abb070bcb83ec503beaceff'
     and '99925725722e255ce214c4cfb61018cbf2729439'