archiving unused branches
merge r960:965 from asterix_stabilization_printerfix_staging

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