merge of '28a8c519bdad5460acd375fdfc946ccc83177df6'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:07:56 +0000 (12:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 12:07:56 +0000 (12:07 +0000)
commitc665c146f949fb40806285277e65c6bfc4fa1c23
tree02d7bdd7707ada103c399f89d1d3af6328c218f8
parentfc5fa44544b61fe20011986480b945eb4ff7f20a
parent50a725086ad78d6733af3896710c38712c54ceed
Merge ... '28a8c519bdad5460acd375fdfc946ccc83177df6'
     and '640195905df353942a1e0cde6e72a194c3a7434a'