merge of 'aaf6c550254109a87b66440444b7d453231240a5'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 08:33:25 +0000 (08:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 08:33:25 +0000 (08:33 +0000)
commit8e621ef0bb79a8a126d3341b0038ba5a52a524df
tree78f1f0bf144c8fe931fc9ba1e535f1ecc1ca1bd0
parentebed2cfe6be1bf678da2ef95a369c84495b245b4
parentb85d87f6885f5012e630ac61b0ff4a6bb0beb4c2
Merge ... 'aaf6c550254109a87b66440444b7d453231240a5'
     and 'b24e3d33fdc14fb2a96ead3a6312444644f1246d'