merge of 'e9e7550c64fb618ca229a869b9a5ccae9c437121'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jul 2007 14:28:27 +0000 (14:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Jul 2007 14:28:27 +0000 (14:28 +0000)
commit858d38341fd72488e8969a08adae35367f74f767
tree35dddd4acb3ae567e5825757053800ed2e6daabb
parent54e13d01cc387ae3eeb0a332ba19f5af1204cec7
parent799d1743b2b51e7470ed17625edbb30fe6a9e73e
Merge ... 'e9e7550c64fb618ca229a869b9a5ccae9c437121'
     and 'efa64132e0fc0c02d7eb3be193b7df736281ee8a'