merge of '8e5f52d55ce4ef85a95a0677d76872828c00c442'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:37 +0000 (20:17 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 10 Mar 2008 20:17:37 +0000 (20:17 +0000)
commita5fecbe92459f63039b60eb8e87cca03a4d34da6
treeb959a3ba35fd4e5cb5842ea670059f0de9aec8dc
parentebdd4e7ae4c38490edb87cedab20580e06edf0f3
parentf1d559783cdcde49481ef12588ff132e2a1570b6
Merge ... '8e5f52d55ce4ef85a95a0677d76872828c00c442'
     and 'be576e67ae1ad6b3f0b22b6e46bfdf8f3243c00e'