Merge branch 'master' into topic/cmop-merge
Dave Rolsky [Mon, 27 Dec 2010 19:52:03 +0000 (14:52 -0500)]

Trivial merge