Commit 9ab15a826603d899595894e2fd78c46f90fe5bac

Con Kolivas 2011-08-24T17:34:19

Merge branch 'hash'