merge of '0bbc4414a3d984fe899446fe3d8f50b9238cc3dc'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:00 +0000 (19:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 16 Feb 2008 19:54:00 +0000 (19:54 +0000)
commit65f11a6585828a99357b8aa0edc50855998390b4
tree04865d93ff93a1881da4985da38555a762425637
parentc1c3aa4892bfe913d837781b4078a0f63def42b4
parent81d60d223becf845ecc2a035648f9effd2437d0e
Merge ... '0bbc4414a3d984fe899446fe3d8f50b9238cc3dc'
     and '98f85bb96baab42bb0d213a35c2cd9f1c06a3f47'