Merge branch '2.0'
authorThomas Schmidt <tschmidt@suse.de>
Wed, 16 Mar 2011 14:48:53 +0000 (15:48 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Wed, 16 Mar 2011 14:48:53 +0000 (15:48 +0100)
commitc545a8c098121efe28763006c66d13107a470231
treec6ef2d3c73e5f151dc9a87a20a26df8f29a8693d
parentabccf8d2a54b721824cedf31d8b82e722575aca0
parentf3b86bf23fc73533984e2ccee4355dfa2875585c
Merge branch '2.0'