Merged asterix-fix-issue-113 after review from Zach.

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization@264 eaa15691-b419-025a-1212-ee371bd00084