merge of '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 18:31:14 +0000 (18:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 18:31:14 +0000 (18:31 +0000)
commit6e9c45c2c4f8f33aec7cda649c3e0236075a0ced
tree25d03a6186fc28a65947906908d56b0ca9441843
parent8003238cac7a1d6fdf31f9ae86d543f9f1f02fff
parent2decb4559a8d343ef03cf160bf7393ba956bb9e1
Merge ... '6951a4bf0c57a677b8f2cdf1144402fe1358e3e1'
     and 'a76f71ae5f89679c6f4ec02e1b1b05e22a7c5905'