merge of '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 23 Mar 2008 17:22:11 +0000 (17:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 23 Mar 2008 17:22:11 +0000 (17:22 +0000)
commite93f32d920cb71827087952eea4ea2fb61eb7263
tree8166a9a26e55614ff684acb02d1ef00b7f10ae40
parentaf48397096325a068dc8edfb6992898574dd85e4
parent000108573470503cad4447b8f5c8bd026712dd5f
Merge ... '0d93ec84b30bc1bee2caaee72d667f87bc468a70'
     and '4d3f6129ff74b55c246c109b0515837fb4fcef27'