Merge commit 'dkg/master'

author Jameson Graef Rollins <jrollins@phys.columbia.edu>

Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)

committer Jameson Graef Rollins <jrollins@phys.columbia.edu>

Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
author Jameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
committer Jameson Graef Rollins <jrollins@phys.columbia.edu>
Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
diff --cc website/doc.mdwn
Simple merge
diff --cc website/local.css
Simple merge
author	Jameson Graef Rollins <jrollins@phys.columbia.edu>
	Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
committer	Jameson Graef Rollins <jrollins@phys.columbia.edu>
	Fri, 5 Sep 2008 05:35:46 +0000 (22:35 -0700)
		1	2
website/doc.mdwn	patch \|	diff1 \|	diff2 \|	blob \| history
website/local.css	patch \|	diff1 \|	diff2 \|	blob \| history