Merge branch '2.0'
authorThomas Schmidt <tschmidt@suse.de>
Thu, 3 Mar 2011 10:19:20 +0000 (11:19 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Thu, 3 Mar 2011 10:19:20 +0000 (11:19 +0100)
commit260bcc2ba75a0e447e224bed1bde466b92cbc919
tree2322131d7df6c0abae282b765e2a47ce8a0b8751
parent001a1878dbeb55b653558033178caa73a36281d8
parent29a8dc9800b1342ac04b73473cc517050572df9f
Merge branch '2.0'