merge of '1680814672cc2662009b0e45fa9e20b4c5bc0968'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:38:16 +0000 (19:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 13 Jan 2008 19:38:16 +0000 (19:38 +0000)
commitb7ee6eac558fbca6f94cc056c61609c3ea194028
treeea9023467300d5639463470205287cd462a110b1
parentd81ced2aff13ef95ebf670c40d1f0768582264da
parent052e13d635e64286f4116a59f643716771768c1f
Merge ... '1680814672cc2662009b0e45fa9e20b4c5bc0968'
     and '9b6e07a74ea0e9d244bc786420721f90d0ce1204'