merge of '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 5 Jan 2008 19:25:48 +0000 (19:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 5 Jan 2008 19:25:48 +0000 (19:25 +0000)
commit2c88ed78a67665a962a5b9a5e977cbed8b333c22
treefc2e664e4ed435ce6ebe42218f92e89c6ab0d4b7
parent5cc0bc5c6f897d58724a11978979575c9b588985
parent742fb4ae71e6a7e655385086ba9edebbf00b6ebd
Merge ... '5e5ed72728986531bc9fcd00f87f56051f1fbff5'
     and '897413a90458757cb227c0afbc74963d175a60a7'