tree 92bce07025f66df5abca8a819becd09b6486a3d4
parent 2f199b003d064c638c50df012e34e248c202ebed
author ramangrover29 <ramangrover29@eaa15691-b419-025a-1212-ee371bd00084> 1360733644 +0000
committer ramangrover29 <ramangrover29@eaa15691-b419-025a-1212-ee371bd00084> 1360733644 +0000

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