merge of '96cde176098aad6ac5bbe96aa5d939a61de53f6d'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 16:17:07 +0000 (16:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Feb 2008 16:17:07 +0000 (16:17 +0000)
commite60a4a4b6993cdea4c11503b630c9db84b2a13ca
treed120508f7fbcaf7dad27c6e362df9e59209e4aed
parentf55e1cd950a96045de381abedde9e2727d001234
parentd943db59fb909d40ad1dbeea2a3f74f94c372132
Merge ... '96cde176098aad6ac5bbe96aa5d939a61de53f6d'
     and 'c8560517964ebe70f94d18575236bb3b49f087b8'