--fixed for CRM-12233
Merge branch 'master' of git://github.com/civicrm/civicrm-core into CRM-12233
-- sample data fixes for CRM-12233
Merge pull request #279 from pradpnayak/CRM-12233

--fixed for CRM-12233