Merge branch 'master' into templatemove

author Joey Hess <joey@kitenet.net>

Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)

committer Joey Hess <joey@kitenet.net>

Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)
author Joey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)
committer Joey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)
diff --cc doc/todo/auto_rebuild_on_template_change.mdwn
Simple merge
author	Joey Hess <joey@kitenet.net>
	Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)
committer	Joey Hess <joey@kitenet.net>
	Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)