resolved self conflict
resolved self conflict

git-svn-id: http://svn.code.sf.net/p/petavision/code/sandbox@5999 7c0444ca-5550-0410-9008-faecdbe78eb5

Former-commit-id: 2c9086612ec82ff7496c36de49b994fe2fb08059
dpaiton/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV,PetaVision/OpenPV,dpaiton/OpenPV