merge of '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 25 Jun 2008 16:14:42 +0000 (16:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 25 Jun 2008 16:14:42 +0000 (16:14 +0000)
commit4f88892c45fee76e94909c22b460732ae2ac3b9f
tree7ec16544af7ea1b7d6b02bd2a9f297cd6573fd27
parent40b978626b9884ba8f821e702d34d437249d9762
parent23d98149f6f992cddd3af6c4b1865e780c5af8d3
Merge ... '5ebc68ac23faeb96effdf4f594c20c57c3f1ab5c'
     and '85a1e5d843207f3fcf6f1043a822a543e89cc938'