Merge branch '2.0' 2.5
authorThomas Schmidt <tschmidt@suse.de>
Mon, 7 Mar 2011 13:54:21 +0000 (14:54 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Mon, 7 Mar 2011 13:54:21 +0000 (14:54 +0100)
commitabccf8d2a54b721824cedf31d8b82e722575aca0
treed202ece8a08fe69f1bbfa7503e5b2f1700581722
parent260bcc2ba75a0e447e224bed1bde466b92cbc919
parent47cf26c1264e6d0700a65c5d086d9349dc5fd720
Merge branch '2.0'