merge of '05cc5d66198a3d72159d333ad23069009f5c5cda'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 12:38:03 +0000 (12:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 12:38:03 +0000 (12:38 +0000)
commitf7f570b1865e28857a64294078ded7493f4c247d
tree1afd115c1e1da489afd30cecd5795660278c626b
parent02c35cbf6612509ba819710882ed5f3789c715fd
parent77916aa42c69fa2a78670515c826cf18a429fc06
Merge ... '05cc5d66198a3d72159d333ad23069009f5c5cda'
     and '54fa1e3c0521ed472d0150900302a759edeb5c95'