Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5
commitd908096d8a84183cc8fb95ce738a67092d88d82d
authorMichal Čihař <mcihar@suse.cz>
Thu, 8 Mar 2012 15:05:41 +0000 (8 16:05 +0100)
committerMichal Čihař <mcihar@suse.cz>
Thu, 8 Mar 2012 15:05:41 +0000 (8 16:05 +0100)
treef2dad4d0213e99b58b59559afa28c63cef6c697a
parent275249b147204f0a2fb0828db3cdecb4d4c3b449
parent798d04f63030024f49da440b648c05e46b5f1b24
Merge remote-tracking branch 'origin/QA_3_4' into QA_3_5