tree 125482f73fb79744858b7fe65cd82dc0d1f86916
parent 6b15af77560c0e29fac2478dc8332abb24587d25
parent 2de6d34b90d9f26a496b418f42a0777f9071b4f0
author zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1361061655 +0000
committer zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1361061655 +0000

merged asterix_stabilization r1196:1212 into issue173 branch

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