merge of '31de530bc2ccfc10a0020cfb5eab126481380149'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 18:41:46 +0000 (18:41 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 18:41:46 +0000 (18:41 +0000)
commitcf0aac3ac342d1a1614ee7d76a96c13418635b00
treee9511ec1b860f6e0b3f73e8ed44fc5e868d5c36c
parent0c718d3fc5e6e61058811f05f41280ca369941ef
parentda8fa5ef28c25be53776b4f6a99cb88567d26a6e
Merge ... '31de530bc2ccfc10a0020cfb5eab126481380149'
     and 'b972704167f6ef738f541485ce27cba47e88e225'