Merge branch 'release' into stable

author Sergio Ahumada <sergio.ahumada@digia.com>

Thu, 31 Jan 2013 15:08:06 +0000 (16:08 +0100)

committer Sergio Ahumada <sergio.ahumada@digia.com>

Thu, 31 Jan 2013 15:08:11 +0000 (16:08 +0100)
author Sergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:08:06 +0000 (16:08 +0100)
committer Sergio Ahumada <sergio.ahumada@digia.com>
Thu, 31 Jan 2013 15:08:11 +0000 (16:08 +0100)
diff --cc src/designer/src/designer/doc/src/designer-manual.qdoc
Simple merge
diff --cc src/designer/src/lib/uilib/formbuilder.cpp
Simple merge
author	Sergio Ahumada <sergio.ahumada@digia.com>
	Thu, 31 Jan 2013 15:08:06 +0000 (16:08 +0100)
committer	Sergio Ahumada <sergio.ahumada@digia.com>
	Thu, 31 Jan 2013 15:08:11 +0000 (16:08 +0100)
		1	2
src/designer/src/designer/doc/src/designer-manual.qdoc	patch \|	diff1 \|	diff2 \|	blob \| history
src/designer/src/lib/uilib/formbuilder.cpp	patch \|	diff1 \|	diff2 \|	blob \| history