Merge branch 'master' into moc_parse
Merge branch 'moc_parse' of http://www.github.com/mempko/firestr into moc_parse
Merge branch 'moc_parse' of http://www.github.com/mempko/firestr into moc_parse
fixed memory leak

Ignore-this: 7ac041d791deee577743b738723883d4

darcs-hash:20130520221726-c21fe-d4751f94b91f45f89f158c927adb1e3969fcb284
Merge branch 'master' into moc_parse