Merge branch 'QA_3_4'
commit4bcbd156e45320e6483d8c4673d81b05a54c8b3b
authorMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 12:47:32 +0000 (11 14:47 +0200)
committerMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 12:47:32 +0000 (11 14:47 +0200)
treeadd7dcc54282d3817cbeb2511471cf7de6b03262
parenta4ac8d6becbe8676771def662a900d47216823c7
parent655f72e47459abd2220b96962b334e299be9889f
Merge branch 'QA_3_4'