Merge branch '2.0'
authorThomas Schmidt <tschmidt@suse.de>
Thu, 28 Jul 2011 15:30:43 +0000 (17:30 +0200)
committerThomas Schmidt <tschmidt@suse.de>
Thu, 28 Jul 2011 15:30:43 +0000 (17:30 +0200)
commita8b0033168d20d6848a5958487bfe50735c068cc
treeabf1c4460b9ad2fb5a86521e5949fe4ca2613c55
parent509e40d8d6afc5411910b2105f223f2be98c1f71
parent7e757e9e02b290376e7ef92e8f7e8ac0a7bc5476
Merge branch '2.0'