tree eb90b5e7a041e24b748c0179286e4e707f737805
parent 6fb1df40f2d44309dc7ecbb02a3a8dc73678911c
parent 60d88256d9aa8d4f12add9f86355bf50cca9bf01
author zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1336439122 +0000
committer zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> 1336439122 +0000

merged r232:233 from asterix_stabilization

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