Merge pull request #436 from dlobo/CRM-12274
authordlobo <lobo@civicrm.org>
Mon, 15 Apr 2013 18:31:11 +0000 (11:31 -0700)
committerdlobo <lobo@civicrm.org>
Mon, 15 Apr 2013 18:31:11 +0000 (11:31 -0700)
CRM-12274


Trivial merge