merge of 'b9087aed5992eb3d85c7c859b89c4236a3d7e178'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 1 Sep 2007 23:59:27 +0000 (23:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 1 Sep 2007 23:59:27 +0000 (23:59 +0000)
commit351cd9530d15979dc326d70e3e996a5c33eb869f
tree3be98f37cc239867c9988e4858189cb5c05510e5
parent71c1bbf20c1dcf267de37dee9a3ea97799ce568c
parent60ee4a5f135a084051d75dc34ac8987c31703d80
Merge ... 'b9087aed5992eb3d85c7c859b89c4236a3d7e178'
     and 'de0f7d33bace1070e3a1202edc6e122f22d6873c'