am 66bdbe48: Hint sorting, remove XML, follow refactor.
Jeff Sharkey [Tue, 10 Sep 2013 04:46:15 +0000 (21:46 -0700)]
* commit '66bdbe486e572aee1b06e3dbea9daf87ceb0e1bb':
  Hint sorting, remove XML, follow refactor.


Trivial merge