am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT...
Wink Saville [Mon, 7 Oct 2013 00:10:54 +0000 (17:10 -0700)]
* commit '7351fdfb5b61da990f72cdc18dead250a9e5379c':
  Hipri should not be enabled by default. DO NOT MERGE.


Trivial merge