merge of '707ad036e743d1d9e376f5872e832b2977285dc8'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 22:28:30 +0000 (22:28 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 29 Jun 2008 22:28:30 +0000 (22:28 +0000)
commit104bf0e49f6238e97df033c3f16a874db34c97bc
tree94ee763945808fbecfddfd0dbd9bfa21c3cba741
parentaad08c65f22538011d5e376e1af6ecafd7d6a294
parentc10b72c1c647012c51ac61e599be843dbd9aa6a3
Merge ... '707ad036e743d1d9e376f5872e832b2977285dc8'
     and 'a066601e9e566c2b3f758140100b9c2425bd110c'