merged r232:233 from asterix_stabilization

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