Merge branch 'master' into dependency-types

author Joey Hess <joey@gnu.kitenet.net>

Thu, 8 Oct 2009 01:26:57 +0000 (21:26 -0400)

committer Joey Hess <joey@gnu.kitenet.net>

Thu, 8 Oct 2009 01:26:57 +0000 (21:26 -0400)
author Joey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 01:26:57 +0000 (21:26 -0400)
committer Joey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 01:26:57 +0000 (21:26 -0400)
diff --cc doc/todo/dependency_types.mdwn
Simple merge
author	Joey Hess <joey@gnu.kitenet.net>
	Thu, 8 Oct 2009 01:26:57 +0000 (21:26 -0400)
committer	Joey Hess <joey@gnu.kitenet.net>
	Thu, 8 Oct 2009 01:26:57 +0000 (21:26 -0400)