From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 1 Jan 2011 18:17:38 +0000 (-0600)
Subject: Merge branch 'topic/cmop-merge'
X-Git-Tag: 1.9900~3
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ac943d92666249e97f1455dec74ac84c7bd1af13;p=gitmo%2FMoose.git

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

ac943d92666249e97f1455dec74ac84c7bd1af13