tree 8c0c911c2f16ddf0242307e8ca76ecdd84c4e5bc
parent 2de6d34b90d9f26a496b418f42a0777f9071b4f0
parent f2660a24e726e365bab62e20b9b03e275bde642d
author zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1361244741 +0000
committer zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1361244741 +0000

merged asterix_stabilization_issue_173 into asterix_stabilization

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