Merge branch 'master' into topic/cmop-merge
authorDave Rolsky <autarch@urth.org>
Mon, 27 Dec 2010 19:52:03 +0000 (14:52 -0500)
committerDave Rolsky <autarch@urth.org>
Mon, 27 Dec 2010 19:52:03 +0000 (14:52 -0500)
commit56631d7a6a6b033c357239d5ac74b598b371cb41
treed78b18690e2987b2f70c7616946e5003730502df
parentd2aeefa7bf3fa14fba310493270a54a4c242723c
parent730bf5ef34ad788bb309a59a35fbc026aecd61d8
Merge branch 'master' into topic/cmop-merge