merge of '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 31 Jul 2007 23:47:30 +0000 (23:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 31 Jul 2007 23:47:30 +0000 (23:47 +0000)
commit997ce347575f7c5f7d19290fd6a84cf8d536c04a
treeedf2dd6e03cf7123d2fbb21770511d3b4a54ae39
parenta26a9fc2d2158f4881adf3b3511aa951fc27a8b9
parent816db9f91c684f3d81c16e10fe1410c3530a2389
Merge ... '2ee5368f3cc4e859f6bec4ecffc2dbc9385fa3d7'
     and '62b5fc0f9207b54a854b0ea813248e4ab12bdb81'