tree 8206223883f878fabc2b00a39d2d108bcac67523
parent ab6d3491e5c6a8f2cca6c42a9110e60538056a1c
parent d89a6bfef5d75fcc154b77ae96a3002fdb80df12
author ramangrover29@gmail.com <ramangrover29@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> 1361733706 +0000
committer ramangrover29@gmail.com <ramangrover29@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> 1361733706 +0000

merge from asterix_stabilization r1199 through r1240

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