merge of '2af79ceb1e37ba57b38b201f8034eb9d90da8f12'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 6 Sep 2006 20:29:36 +0000 (20:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 6 Sep 2006 20:29:36 +0000 (20:29 +0000)
commit7dde589d6413662585908540a0078aee0e6dfb15
treec34dfeede8cdb49c1b8267a42d8e92c2f093ea69
parent2ca0a4e92903aff560061711b91d4f0c62795fd9
parentf4c5bad2b962336d79ac962e4f5cb014b311c584
Merge ... '2af79ceb1e37ba57b38b201f8034eb9d90da8f12'
     and '337cfe2dd7c694a21c34148c5094a3ab6d4f6b8f'