move into trunk
authorStephan Kulow <coolo@suse.de>
Fri, 15 Feb 2008 09:50:42 +0000 (09:50 +0000)
committerStephan Kulow <coolo@suse.de>
Fri, 15 Feb 2008 09:50:42 +0000 (09:50 +0000)

Trivial merge