merge of 2c2427ae9aeb6ca358a92e745e1051f1d06134df
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Dec 2006 10:50:15 +0000 (10:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Dec 2006 10:50:15 +0000 (10:50 +0000)
commit5cc373e182132d29d1d2dccf849c6919267a906f
tree29b511f226cfe7dff733ecfffaac6416738ce731
parent5867a6e1cef42d662a79bf96f1412342a1608b3f
parentf8a2e56da94229ca24c532cf8003d5e87916c1a2
merge of 2c2427ae9aeb6ca358a92e745e1051f1d06134df
     and 65c95bf6c423272c963b3df3c62c0fcee9c7cf71