Merge branch 'master' into japanese
Shawn M Moore [Mon, 14 Sep 2009 02:48:45 +0000 (11:48 +0900)]
1  2 
moose-class/slides/index.html

Simple merge