Merge branch 'maint'

author Sven Verdoolaege <skimo@kotnet.org>

Wed, 18 Jan 2012 17:41:37 +0000 (18 18:41 +0100)

committer Sven Verdoolaege <skimo@kotnet.org>

Wed, 18 Jan 2012 17:41:37 +0000 (18 18:41 +0100)
author Sven Verdoolaege <skimo@kotnet.org>
Wed, 18 Jan 2012 17:41:37 +0000 (18 18:41 +0100)
committer Sven Verdoolaege <skimo@kotnet.org>
Wed, 18 Jan 2012 17:41:37 +0000 (18 18:41 +0100)
diff --cc isl_aff.c
Simple merge
diff --cc isl_vertices.c
Simple merge
author	Sven Verdoolaege <skimo@kotnet.org>
	Wed, 18 Jan 2012 17:41:37 +0000 (18 18:41 +0100)
committer	Sven Verdoolaege <skimo@kotnet.org>
	Wed, 18 Jan 2012 17:41:37 +0000 (18 18:41 +0100)
		1	2
isl_aff.c	patch \|	diff1 \|	diff2 \|	blob \| history
isl_vertices.c	patch \|	diff1 \|	diff2 \|	blob \| history