Merge branch 'master' into blub/bc3

author Wolfgang (Blub) Bumiller <blub@speed.at>

Fri, 10 Aug 2012 18:48:42 +0000 (20:48 +0200)

committer Wolfgang (Blub) Bumiller <blub@speed.at>

Fri, 10 Aug 2012 18:48:42 +0000 (20:48 +0200)
author Wolfgang (Blub) Bumiller <blub@speed.at>
Fri, 10 Aug 2012 18:48:42 +0000 (20:48 +0200)
committer Wolfgang (Blub) Bumiller <blub@speed.at>
Fri, 10 Aug 2012 18:48:42 +0000 (20:48 +0200)
diff --cc ast.c
Simple merge
diff --cc ast.h
Simple merge
diff --cc ir.c
Simple merge
diff --cc ir.h
Simple merge
author	Wolfgang (Blub) Bumiller <blub@speed.at>
	Fri, 10 Aug 2012 18:48:42 +0000 (20:48 +0200)
committer	Wolfgang (Blub) Bumiller <blub@speed.at>
	Fri, 10 Aug 2012 18:48:42 +0000 (20:48 +0200)
		1	2
ast.c	patch \|	diff1 \|	diff2 \|	blob \| history
ast.h	patch \|	diff1 \|	diff2 \|	blob \| history
ir.c	patch \|	diff1 \|	diff2 \|	blob \| history
ir.h	patch \|	diff1 \|	diff2 \|	blob \| history