Merge pull request #10 from ozkriff/master

Updated for rustc cf7df1e63 2014-11-19 07:21:42 - namespaced enums
android: Updated for rust e583c4d24 2014-11-21 09:01:50 +0000