Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr

author Marc-André Moreau <marcandre.moreau@gmail.com>

Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)

committer Marc-André Moreau <marcandre.moreau@gmail.com>

Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
author Marc-André Moreau <marcandre.moreau@gmail.com>
Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
committer Marc-André Moreau <marcandre.moreau@gmail.com>
Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
diff --cc libfreerdp-codec/color.c
Simple merge
diff --cc libfreerdp-utils/CMakeLists.txt
Simple merge
diff --cc libfreerdp-utils/dsp.c
Simple merge
author	Marc-André Moreau <marcandre.moreau@gmail.com>
	Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
committer	Marc-André Moreau <marcandre.moreau@gmail.com>
	Fri, 25 May 2012 22:45:12 +0000 (18:45 -0400)
		1	2
libfreerdp-codec/color.c	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp-utils/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
libfreerdp-utils/dsp.c	patch \|	diff1 \|	diff2 \|	blob \| history