merge of '64e8fcf86d823ff35b714a70b3125d2fc95ded55'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 10:46:35 +0000 (10:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Feb 2008 10:46:35 +0000 (10:46 +0000)
commit9e1879c6bff04588c342854632b4569ea1273a97
tree187db31862475b19d00a4c12b17e9962527dd220
parent0b0038780ce149f018f511a7adfd4d0773ab9a5d
parent6836f43ea4f5dffc94d623c01cf3c39b56af8eef
Merge ... '64e8fcf86d823ff35b714a70b3125d2fc95ded55'
     and '7cc9c98056838b4d2eb67baf00c13e220ae94a0a'