Merge branch 'master' into po

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

Fri, 27 Mar 2009 19:51:35 +0000 (15:51 -0400)

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

Fri, 27 Mar 2009 19:51:35 +0000 (15:51 -0400)
author Joey Hess <joey@gnu.kitenet.net>
Fri, 27 Mar 2009 19:51:35 +0000 (15:51 -0400)
committer Joey Hess <joey@gnu.kitenet.net>
Fri, 27 Mar 2009 19:51:35 +0000 (15:51 -0400)
diff --cc doc/todo/need_global_renamepage_hook.mdwn
Simple merge
author	Joey Hess <joey@gnu.kitenet.net>
	Fri, 27 Mar 2009 19:51:35 +0000 (15:51 -0400)
committer	Joey Hess <joey@gnu.kitenet.net>
	Fri, 27 Mar 2009 19:51:35 +0000 (15:51 -0400)