Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4
commitbfd7073903e80a09755d112bd19ecfbf5cace096
authorMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 12:30:45 +0000 (17 14:30 +0200)
committerMichal Čihař <mcihar@novell.com>
Tue, 17 May 2011 12:30:45 +0000 (17 14:30 +0200)
tree26aa536e740a96b86ad7b3439c698af9f214ffff
parent9a8407e5ce1b8b904e48f2f49b292360ffbd40bf
parent2d388d5856361dcadce0433deb6c08fe8555e13d
Merge remote-tracking branch 'origin/MAINT_3_4_1' into QA_3_4