Merge changes for stable branch
authorDave Rolsky <autarch@urth.org>
Mon, 29 Aug 2011 16:29:18 +0000 (11:29 -0500)
committerDave Rolsky <autarch@urth.org>
Mon, 29 Aug 2011 16:29:18 +0000 (11:29 -0500)
commita76e456509198d752a774942f214922adbe176ae
treef16a8251a98db43707b8f45ec187253cf99254bc
parentd1def9169a9a320433f97a43dbb07b398dd30086
Merge changes for stable branch
Changes