Merge remote-tracking branch 'origin/QA_3_4'
commit2c22b5a87602b76bdaea27f0a9bc06232c5ae824
authorMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 12:32:06 +0000 (17 14:32 +0200)
committerMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 12:32:06 +0000 (17 14:32 +0200)
tree6fbd87260664967aa7f3174e0b61275d80c711db
parentf41d45f75aac70a6bf8147d307e3e8e679f3571a
parentbfd7073903e80a09755d112bd19ecfbf5cace096
Merge remote-tracking branch 'origin/QA_3_4'