merge of '38838ab61d84fb4ed9c36e21484735a9eca09c9c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Apr 2008 22:26:57 +0000 (22:26 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Apr 2008 22:26:57 +0000 (22:26 +0000)
commit784dfc69797f25aed4f0079b4b9df0c1a3c74720
treef0be7aaff6dc37838e031f8880a6a32093e97581
parentd0b1a237477786a0fcd292513a8cf855de16bc7a
parent3d572b55dab462c7767044e03417b0f522a445a3
Merge ... '38838ab61d84fb4ed9c36e21484735a9eca09c9c'
     and '9febc982a33100b03781aa11d0b9064c71b21683'