tree 60357704ae8e65229169ea175f71a0e96c09375e
parent 79c806a88108e8644f9010436811799f6b09600a
parent 003913616b72a3f6db90b143b53e6bc4b44d892f
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354918413 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354918413 +0000

merge asterix_stabilization_printerfix_staing back to asterix_stabilization

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