Merge branch 'master' into 2011-09-09-CxScript

Conflicts:
	include/chaiscript/language/chaiscript_common.hpp
	src/main.cpp

include/chaiscript/language/chaiscript_parser.hpp

@@ -1484,10 +1484,10 @@ namespace chaiscript
               while (Eol()) {}
               
               while (Case()) {
-                while (Eol());
+                while (Eol()) { } // eat
               }
 
-              while (Eol());
+              while (Eol()) { } // eat
 
               if (!Char('}')) {
                 throw exception::eval_error("Incomplete block", File_Position(m_line, m_col), *m_filename);