Commit 0a90207111d7f074b3c87aca53bccc7e054fc4bb

Con Kolivas 2012-10-07T13:22:17

Merge branch 'master' into stratum