Merge branch 'next'

author Peter Korsgaard <jacmet@sunsite.dk>

Thu, 1 Mar 2012 13:05:41 +0000 (14:05 +0100)

committer Peter Korsgaard <jacmet@sunsite.dk>

Thu, 1 Mar 2012 13:05:41 +0000 (14:05 +0100)
author Peter Korsgaard <jacmet@sunsite.dk>
Thu, 1 Mar 2012 13:05:41 +0000 (14:05 +0100)
committer Peter Korsgaard <jacmet@sunsite.dk>
Thu, 1 Mar 2012 13:05:41 +0000 (14:05 +0100)
diff --cc Makefile
Simple merge
diff --cc package/Makefile.cmake.in
Simple merge
author	Peter Korsgaard <jacmet@sunsite.dk>
	Thu, 1 Mar 2012 13:05:41 +0000 (14:05 +0100)
committer	Peter Korsgaard <jacmet@sunsite.dk>
	Thu, 1 Mar 2012 13:05:41 +0000 (14:05 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
package/Makefile.cmake.in	patch \|	diff1 \|	diff2 \|	blob \| history