Merge branch 'master' into eunit

This commit is contained in:
alisdair sullivan 2010-08-07 18:10:34 -07:00
commit beaab9d909