merge of '266f6beb86630b70cfa55df7d2b557a677d187b0'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 15:57:07 +0000 (15:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 15:57:07 +0000 (15:57 +0000)
commitf39547272713578e2bfaae3ec47d073b48a31563
tree276cc974e6585639a82eddc45dc76ebb3c82fefa
parent9a0bde6befaf560d1baf3adbf0488496daabd424
parentedbeb005cd8711b6deef2c46d74b4057d2df0ed3
Merge ... '266f6beb86630b70cfa55df7d2b557a677d187b0'
     and '893542e48954804c96a716027237dc29c119d78b'