Merge branch 'QA_3_4'
commit0f5a9cfdb6ad177a22401ce2020c16bc7a1a2ce4
authorMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 11:39:12 +0000 (17 13:39 +0200)
committerMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 11:39:12 +0000 (17 13:39 +0200)
tree9f8cd552c2ba2ce86ab2e3c78718b352e1a5fd35
parentffe3a79301c108b1b7041d98c76429b90f42f708
parent32cdee1d8ab988abc4f08a86bdb9067bb91fbe3c
Merge branch 'QA_3_4'