Merge branch 'master' of https://github.com/civicrm/civicrm-core into labels
authoreileen <eileen@fuzion.co.nz>
Fri, 30 Aug 2013 05:05:22 +0000 (17:05 +1200)
committereileen <eileen@fuzion.co.nz>
Fri, 30 Aug 2013 05:05:22 +0000 (17:05 +1200)

Trivial merge