merge of '11190e741ffccdf2d209ad44d788d7a645b62eef'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 12:07:32 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 25 Jul 2008 12:07:32 +0000 (12:07 +0000)
commit482c970114f031bce74c3ea7bb548bbe609d905c
tree0e0ccd6fb4963bc79a33ae3dbc09de4189d6d416
parent61b8fecfd244e7d73491b2558dede15f8541fa79
parent467e6ea8007f2e5073f1bb36c107af969725b8b0
Merge ... '11190e741ffccdf2d209ad44d788d7a645b62eef'
     and 'fe8733bd5827d972336bdf138c9082df08f4d847'