Merge branch 'QA_3_4'
commit21766b684be69f185b85c61d6da07af02d5d71b2
authorMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 12:00:30 +0000 (11 14:00 +0200)
committerMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 12:00:30 +0000 (11 14:00 +0200)
tree4968293b0c833309967aae7ed21ff007f02ebe9e
parent88ff8be6afcb833153372afd3a56fe65f303681a
parent5687ac290e64ad82c9dc709a8d0850b7e8a99198
Merge branch 'QA_3_4'