tree 60357704ae8e65229169ea175f71a0e96c09375e
parent 1e4fbaded99f68a856aa1d781b629e948b307356
parent 79c806a88108e8644f9010436811799f6b09600a
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354912498 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354912498 +0000

merge 965:1021 from asterix_stabilization to asterix_stabilization_printerfix_staging

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