Usernotes4 25x

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=28764

Rebased.  Previous pull was https://github.com/joomla/joomla-cms/pull/298.