Merge branch '2.0' master
authorThomas Schmidt <tschmidt@suse.de>
Thu, 12 Jan 2012 10:34:36 +0000 (11:34 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Thu, 12 Jan 2012 10:34:36 +0000 (11:34 +0100)
commit2c9e1e223c01a710d30e56bdbf9074fe61760e35
tree844ed7f161c2d06529e3a969da213d6d636278d0
parent74274098a6815e5f76bbbf0e2f8d994a2158e041
parent3b7ce62e92ae29d13f26873f0b214fe3d1f68ceb
Merge branch '2.0'