Reintegrated asterix-fix-issue-9 after Vinayak's review. Fixed issue 9.

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