Merge pull request #390 from yashodha/CRM-12274
authorcolemanw <coleman@civicrm.org>
Thu, 11 Apr 2013 18:20:59 +0000 (11:20 -0700)
committercolemanw <coleman@civicrm.org>
Thu, 11 Apr 2013 18:20:59 +0000 (11:20 -0700)
Crm 12274


Trivial merge