Merge remote branch 'public/master'

This commit is contained in:
Michael DeHaan 2012-03-26 19:36:03 -04:00
commit eb67a91c57