Merge branch 'tutorial_update_1108'
hkclark [Sat, 3 Sep 2011 02:30:05 +0000 (22:30 -0400)]

Trivial merge