Merge branch 'QA_3_4'
commitd5f4903d208e6810ab8986b1b65bd891040c79a9
authorMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 11:07:17 +0000 (11 13:07 +0200)
committerMichal Čihař <mcihar@novell.com>
Wed, 11 May 2011 11:07:17 +0000 (11 13:07 +0200)
tree92466bb18019865f65358c2cb2a8fa13871f84e2
parent099ee52ce48f4423d29f5ddd636666131633e036
parent332f3da9026e70d460e22f12ca77ce0911fa5ee0
Merge branch 'QA_3_4'