Merge in updates (including removal of some depcrated bits from the examples).
authorBrian Aker <brian@tangent.org>
Thu, 14 Apr 2011 04:51:43 +0000 (21:51 -0700)
committerBrian Aker <brian@tangent.org>
Thu, 14 Apr 2011 04:51:43 +0000 (21:51 -0700)

Trivial merge