previous commit wrongly resolved the conflict for one view.  this gives me a chance to properly record that we now complete    merge branches/rails-2.0 r820:1235 into trunk
previous commit wrongly resolved the conflict for one view.  this
gives me a chance to properly record that we now complete
   merge branches/rails-2.0 r820:1235 into trunk



riseuplabs/crabgrass,riseuplabs/crabgrass,nilclass/echosocial,ajturner/crisiscommons,nilclass/echosocial,riseuplabs/crabgrass,riseuplabs/crabgrass,ajturner/crisiscommons,geoiq/digitalgazette,riseuplabs/crabgrass,adammck/crabgrass,adammck/crabgrass,ajturner/crisiscommons,adammck/crabgrass,geoiq/digitalgazette,geoiq/digitalgazette,ajturner/crisiscommons,adammck/crabgrass,riseuplabs/crabgrass,nilclass/echosocial,geoiq/digitalgazette,nilclass/echosocial,riseuplabs/crabgrass