From: Dave Rolsky <autarch@urth.org>
Date: Mon, 27 Dec 2010 19:52:03 +0000 (-0500)
Subject: Merge branch 'master' into topic/cmop-merge
X-Git-Tag: 1.9900~3^2~28
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=56631d7a6a6b033c357239d5ac74b598b371cb41;p=gitmo%2FMoose.git

Merge branch 'master' into topic/cmop-merge
---

56631d7a6a6b033c357239d5ac74b598b371cb41