Merge branch 'master' into templatemove

author Joey Hess <joey@kitenet.net>

Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)

committer Joey Hess <joey@kitenet.net>

Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
author Joey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
committer Joey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
diff --cc Makefile.PL
Simple merge
diff --cc doc/todo/auto_rebuild_on_template_change.mdwn
Simple merge
author	Joey Hess <joey@kitenet.net>
	Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
committer	Joey Hess <joey@kitenet.net>
	Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
		1	2
Makefile.PL	patch \|	diff1 \|	diff2 \|	blob \| history
doc/todo/auto_rebuild_on_template_change.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history