Edward - 2012-06-17

this should probably wait until the repository is fixed for further testing.