Merge branch 'rh' into dev

author davin baragiotta <davin.baragiotta@u-db.(none)>

Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)

committer Davin BARAGIOTTA <davin.baragiotta@auf.org>

Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
author davin baragiotta <davin.baragiotta@u-db.(none)>
Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
committer Davin BARAGIOTTA <davin.baragiotta@auf.org>
Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
diff --cc project/settings.py
Simple merge
diff --cc project/urls.py
Simple merge
author	davin baragiotta <davin.baragiotta@u-db.(none)>
	Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
committer	Davin BARAGIOTTA <davin.baragiotta@auf.org>
	Tue, 5 Apr 2011 13:21:33 +0000 (09:21 -0400)
		1	2
project/settings.py	patch \|	diff1 \|	diff2 \|	blob \| history
project/urls.py	patch \|	diff1 \|	diff2 \|	blob \| history