Merge branch 'backport' into work

author Dana Jansens <danakj@orodu.net>

Mon, 8 Feb 2010 19:28:18 +0000 (14:28 -0500)

committer Dana Jansens <danakj@orodu.net>

Mon, 8 Feb 2010 19:28:18 +0000 (14:28 -0500)
author Dana Jansens <danakj@orodu.net>
Mon, 8 Feb 2010 19:28:18 +0000 (14:28 -0500)
committer Dana Jansens <danakj@orodu.net>
Mon, 8 Feb 2010 19:28:18 +0000 (14:28 -0500)
diff --cc .gitignore
Simple merge
diff --cc Makefile.am
Simple merge
author	Dana Jansens <danakj@orodu.net>
	Mon, 8 Feb 2010 19:28:18 +0000 (14:28 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Mon, 8 Feb 2010 19:28:18 +0000 (14:28 -0500)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history