merge of '21a4d6e9a83528919c5fa1100510fac988f3fb20'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 19:07:55 +0000 (19:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 4 Mar 2008 19:07:55 +0000 (19:07 +0000)
commit8b24c6eaabe13f8d3b27b5f4991ccf80cb78e97f
treecd401e0ccac6fb85b1c57c138d26a6ae39416343
parentbf307fa406ef710e80057e43db2319270011d9bd
parentcc9271b7d209c10923870a00b2f8967df583d361
Merge ... '21a4d6e9a83528919c5fa1100510fac988f3fb20'
     and '36ae94ae884a55393124760a3d8811541c62e82d'