Commit e1d01d06356ab452b8e58ade1f239efb383479bf

ckolivas 2011-06-28T11:18:26

Minor fixes.