Merge branch 'dealing-reuse'

author Arun Persaud <arun@nubati.net>

Sun, 17 Jun 2007 16:57:21 +0000 (18:57 +0200)

committer Arun Persaud <arun@nubati.net>

Sun, 17 Jun 2007 16:57:21 +0000 (18:57 +0200)
author Arun Persaud <arun@nubati.net>
Sun, 17 Jun 2007 16:57:21 +0000 (18:57 +0200)
committer Arun Persaud <arun@nubati.net>
Sun, 17 Jun 2007 16:57:21 +0000 (18:57 +0200)
diff --cc functions.php
Simple merge
diff --cc index.php
Simple merge
author	Arun Persaud <arun@nubati.net>
	Sun, 17 Jun 2007 16:57:21 +0000 (18:57 +0200)
committer	Arun Persaud <arun@nubati.net>
	Sun, 17 Jun 2007 16:57:21 +0000 (18:57 +0200)
		1	2
functions.php	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history