Merge branch 'master' into blub/bc3

author Wolfgang Bumiller <wolfgang.linux@bumiller.com>

Sun, 22 Jul 2012 10:35:29 +0000 (12:35 +0200)

committer Wolfgang Bumiller <wolfgang.linux@bumiller.com>

Sun, 22 Jul 2012 10:35:29 +0000 (12:35 +0200)
author Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Sun, 22 Jul 2012 10:35:29 +0000 (12:35 +0200)
committer Wolfgang Bumiller <wolfgang.linux@bumiller.com>
Sun, 22 Jul 2012 10:35:29 +0000 (12:35 +0200)
diff --cc ast.c
Simple merge
diff --cc ast.h
Simple merge
author	Wolfgang Bumiller <wolfgang.linux@bumiller.com>
	Sun, 22 Jul 2012 10:35:29 +0000 (12:35 +0200)
committer	Wolfgang Bumiller <wolfgang.linux@bumiller.com>
	Sun, 22 Jul 2012 10:35:29 +0000 (12:35 +0200)
		1	2
ast.c	patch \|	diff1 \|	diff2 \|	blob \| history
ast.h	patch \|	diff1 \|	diff2 \|	blob \| history