Merge
authorBryan O'Sullivan <bos@serpentine.com>
Mon, 27 Jun 2011 04:57:41 +0000 (21:57 -0700)
committerBryan O'Sullivan <bos@serpentine.com>
Mon, 27 Jun 2011 04:57:41 +0000 (21:57 -0700)

Trivial merge