archiving unused branches
merge r1183:1187 (from asterix_stabilization)

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_issue_252_253@1188 eaa15691-b419-025a-1212-ee371bd00084
7 files changed