Merge pull request #903 from dlobo/MiscFixes
authordlobo <lobo@civicrm.org>
Wed, 29 May 2013 17:51:57 +0000 (10:51 -0700)
committerdlobo <lobo@civicrm.org>
Wed, 29 May 2013 17:51:57 +0000 (10:51 -0700)
Misc fixes


Trivial merge