merge of '5df8864bb6077e592cab2f4f7568f207380225e4'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 20:10:45 +0000 (20:10 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 20:10:45 +0000 (20:10 +0000)
commit5718dca66762a03cef78a39dd4d8cfd41f928cdd
tree3c4f5496c1e83ceef547ebb482b8ab018b2a894e
parent15a7689077c7238e639975a30420d8dcff62e988
parent6b969e40156c42692f98157bf26982adb86da18c
Merge ... '5df8864bb6077e592cab2f4f7568f207380225e4'
     and 'e2cb5d1e0ecaf7ec345106320eaa9ab93d254714'