merge of '61be15dc709dfd7e90a6b6b0dae645794cdea4ef'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:20:09 +0000 (08:20 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:20:09 +0000 (08:20 +0000)
commit243eaf33f10926c0a9c7c5f3f9f07ee9690b659b
tree2dfacac379cb82bdff962a0d1663b138d59092fe
parentd0a553cb6786ac64b046be9e1bd56cdc8f825ab5
parent47078f7bde3ceb0a43ec4a9275810ed554c89584
Merge ... '61be15dc709dfd7e90a6b6b0dae645794cdea4ef'
     and 'c8d8749d5997b7808c2e25161edaa4c4759f3838'