merge of 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Sep 2008 11:12:29 +0000 (11:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 4 Sep 2008 11:12:29 +0000 (11:12 +0000)
commit7151970dde7e1a95c7d829f2b7792e038ef83398
tree845c6d498afbf2de502b731081731d0b0a546c26
parent3a02d533d73cf7dfaddafb7992bcbdc1bc4258ca
parentb95401db19f6290654111d2b0709269a221953c0
Merge ... 'b9249f27ed481c5d02d4b0a68b50c1e6688fe484'
     and 'c8025b1589420ff484c99ad1c0e06906ad36b85d'