tree 332220e040033dccd7c4fce298ce7f2e811aa373
parent b8b5ea091e17abe121c3f704865ec9a630e8e8b6
parent ca49d8cfaa4fe5a37ab6c9845fa19c8083dc219e
author jarodwen <jarodwen@eaa15691-b419-025a-1212-ee371bd00084> 1352228488 +0000
committer jarodwen <jarodwen@eaa15691-b419-025a-1212-ee371bd00084> 1352228488 +0000

merged back branch asterix_stabilization_temp_fix -r 799:846

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