merge of '23bb0a8c4f3ff02382510526c89865eec5758b71'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 15:16:02 +0000 (15:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 15:16:02 +0000 (15:16 +0000)
commitb72b787bc0bc5af3cb31d728b54a58cf0ffc7373
tree99aa46562ddc6b11607d96d2d3cf90047f925d83
parent5614d52cfc598f6685ecdb139d6365374c54a952
parent00d9958b742278e75ce62e96740ceea6c9821bdd
Merge ... '23bb0a8c4f3ff02382510526c89865eec5758b71'
     and 'e9cc6897a9a437e57ba2a9981767654a5d04d336'