merge of '4f7ef143d39b81858bfefba3a315d8285fd52634'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 14:37:58 +0000 (14:37 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 3 Aug 2007 14:37:58 +0000 (14:37 +0000)
commit4a481e9856f4622d0dbcb50c064a4c0dd0a9dcfc
tree8b5dd51fb4f7f45a18013a1e56e64d287f09f93e
parent31af90140f95e186bc2f5a53f725429abaa8df57
parentef84b67e440358b8c8d6067b57aa208568cb5d95
Merge ... '4f7ef143d39b81858bfefba3a315d8285fd52634'
     and '7674b4433c1bb9bc4645e63991d9d2fe659d8577'