merge of 'd506336ff98cc7331f3a17226b7b10cef8817694'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 9 Apr 2008 00:17:35 +0000 (00:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 9 Apr 2008 00:17:35 +0000 (00:17 +0000)
commit200730ec3214ba00c53ce777ec86b30df43e0d4a
tree2f0104f73fa1655e23855cc2b3fd7b82f2e59589
parentfc956806d146e622fee97e6501e752bdfb160a57
parent2cb673260ab625b5149400fabfe8a751ab84c533
Merge ... 'd506336ff98cc7331f3a17226b7b10cef8817694'
     and 'f4ac5cba40afcaee88ee7f46e4ac7ae23cedea9d'