merge of '08f4abe0b59e692c9044f0c59f6e046959c301f2'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 19:03:40 +0000 (19:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 9 Aug 2007 19:03:40 +0000 (19:03 +0000)
commit049708b56d43ea28a890e2d868e980c90be1c356
tree5a08f32a4aaaa26ecce0d0a676ecd5b1fea58429
parent69289b150974e7551aeb9bbf6ed7ef9d27fd329d
parentd0a1e35dc5286ae64477f12c1b3e15a82960d48f
Merge ... '08f4abe0b59e692c9044f0c59f6e046959c301f2'
     and '4ed4d79390a6068104e811416de62ad3af9b3949'