adjust hints to be more precise
Merge branch 'release/20130326-release'

* release/20130326-release:
  adjust hints to be more precise