create branch 'DRUPAL-6--1'.

Cherrypick from master 2009-08-11 15:40:49 UTC Khalid Baheyeldin <kbahey@gmail.com> '#441886 by jcmarco, fago: Improve userpoints rules integration':
    userpoints_rules.rules.inc

#395500 by ilo, time_stamp can now be changed in the API. changed is the field that holds the real time stamp

#431430 by Amitaibu, add token implementation, [user:userpoints]
#431436 by Amitaibu, remove unneeded Rules condition functions. Superceded by token.

#341049 bug fix -- Points on profile were not displayed correctly if many point categories were used

by kbahey, change all instances of  to  so it would not accidentally clash with the global  object

Fixed #362119 user receives access denied when viewing the transaction details of users with no transactions

#360569 by rastatt, add a new translation for uppercase singular point for use by contributed modules.

Fixed #356479 by adding a 3rd = to the check for what category to display, 0 was equaling to empty string as well

Fixed #356479 by adding a 3rd = to the check for what category to display, 0 was equaling to empty string as well