Merge branch '2.0'
authorThomas Schmidt <tschmidt@suse.de>
Thu, 17 Nov 2011 14:11:03 +0000 (15:11 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Thu, 17 Nov 2011 14:11:03 +0000 (15:11 +0100)
commit74274098a6815e5f76bbbf0e2f8d994a2158e041
treee7ed30f07a89584deb3f98370a4cf3d28597ad53
parenta8b0033168d20d6848a5958487bfe50735c068cc
parent610318e1bccebb9af755934fcfb34e1a23223f9f
Merge branch '2.0'