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

Conflicts:
	CMakeLists.txt
	include/chaiscript/dispatchkit/boxed_number.hpp
	include/chaiscript/language/chaiscript_engine.hpp

unittests/short_comparison_test.cpp

@@ -0,0 +1,30 @@
+#include <chaiscript/utility/utility.hpp>
+#include <chaiscript/chaiscript_stdlib.hpp>
+
+class Test {
+ public:
+  Test() : value_(5) {}
+
+  short get_value() { return value_; }
+
+  short value_;
+};
+
+int main()
+{
+
+  chaiscript::ChaiScript chai(chaiscript::Std_Lib::library());
+  chai.add(chaiscript::user_type<Test>(), "Test");
+  chai.add(chaiscript::constructor<Test()>(), "Test");
+
+  chai.add(chaiscript::fun(&Test::get_value), "get_value");
+
+  chai.eval("auto &t = Test();");
+
+  if (chai.eval<bool>("t.get_value() == 5"))
+  {
+    return EXIT_SUCCESS;
+  } else {
+    return EXIT_FAILURE;
+  }
+}