Merge branch '0.9.x' into 1.0.x

author Brion Vibber <brion@pobox.com>

Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)

committer Brion Vibber <brion@pobox.com>

Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)
author Brion Vibber <brion@pobox.com>
Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)
committer Brion Vibber <brion@pobox.com>
Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)
diff --cc classes/Memcached_DataObject.php
Simple merge
diff --cc classes/User.php
Simple merge
diff --cc lib/default.php
Simple merge
diff --cc lib/util.php
Simple merge
author	Brion Vibber <brion@pobox.com>
	Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)
committer	Brion Vibber <brion@pobox.com>
	Mon, 29 Mar 2010 22:15:51 +0000 (15:15 -0700)
		1	2
classes/Memcached_DataObject.php	patch \|	diff1 \|	diff2 \|	blob \| history
classes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/default.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/util.php	patch \|	diff1 \|	diff2 \|	blob \| history