Merge branch '2.0'
authorThomas Schmidt <tschmidt@suse.de>
Thu, 13 Jan 2011 10:03:34 +0000 (11:03 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Thu, 13 Jan 2011 10:03:34 +0000 (11:03 +0100)
commit75d2141cd7850799b8d2b99d58df0ab108e5ed67
tree2bb9b56e01beb5994fd76a7567847fd8a0dee183
parentc4798d4a333bc968f095a145ac1a817cf82aaf73
parent982649166e59e57836285f30ca2377b2f99a1934
Merge branch '2.0'