merge of '47a626b064d50db51af7eff496004f9364e40f2d'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 15:50:50 +0000 (15:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 14 Sep 2008 15:50:50 +0000 (15:50 +0000)
commitc77036e3ee8f664cda70b523b12eb8572259af2e
treebd3f5e236c96cc9be256624239b95ffaca7b4140
parentec17743ff1e21885c45b5647d608411492d808d6
parent8927fbc9685a7766c4dd5df837e43cb4e59d1e34
Merge ... '47a626b064d50db51af7eff496004f9364e40f2d'
     and 'a2824a6775b8569cf6a2471e00624e821562a181'