merge of '52d8aacaac0c09d6552f9d5d66a8cab47c65d4a7'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 16:58:43 +0000 (16:58 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 21 Mar 2008 16:58:43 +0000 (16:58 +0000)
commitdc9e3345fd087227731b17379aa46e1b8ee2d9b6
tree8143a5484abee7cbff9da210fa0fece098d17857
parentd4b4ea8a4cafb8a41843e62c618b5e9ca652c37d
parent728d2d3171bdbdc4dbd432d3186eadfd86986875
Merge ... '52d8aacaac0c09d6552f9d5d66a8cab47c65d4a7'
     and '903edcf621d6b2974f60aceef8e79c2816561136'