Craig Mautner a2303750fb Merge changes I1dfe21e5,Ia0218bf8
* changes:
  Clean up warnings.
  Minor refactorings.
2012-12-19 16:40:18 -08:00
..