merge of '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 12:00:15 +0000 (12:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 30 Jul 2008 12:00:15 +0000 (12:00 +0000)
commite8f7fcb155f8356afc5143982ecc6f4d80fc182e
tree5cac231e66435a23d7938826df72c8c2adca3a05
parent8a0cde8c5a6fb7ee2cf3ca52cd5a68b8f343ca4d
parentcaac732ff2993d831bbaf1071dcca79995a77ea2
Merge ... '87e3cc07eb2fd42d7850e6b0c1f67268404695d0'
     and 'f572f61df65c44a6ea6b9b987560f1edd3171a1b'