merge of 'da96891a2ca8b58603eeace03f70b31bdb83f534'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 13:29:28 +0000 (13:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 12 Aug 2008 13:29:28 +0000 (13:29 +0000)
commit5013da3eac1b9eaa3e459e51868c972f35d13987
tree16969aea9782c4712bea45c3e4b99cb54db2dfe2
parent17749e1e129cdb3a6e4121cd70edb3ad2801e33f
parent5501bf760b33f3cdd0cccc5a413e5fd8540ad3c9
Merge ... 'da96891a2ca8b58603eeace03f70b31bdb83f534'
     and 'ff29d35506adb74555e6297276dcbf0d5adfba55'