merge of '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 11:57:37 +0000 (11:57 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 9 Feb 2008 11:57:37 +0000 (11:57 +0000)
commitb1a5094106821b2d9f0f9140939e3848d9b2a777
tree56cdaf82264504197cb08f676bafbf08a6becdd7
parent39f91766eaca3808c750a5576ff156fcc6cba16e
parent7e682b8378c21d146d2faa8b52447f4a3aefb224
Merge ... '2233080e8bdaa3d4a3eb8a016e6bb014d7c38e45'
     and '95c3495ce460c2f8f04e1188464c72bde51ce0c9'