Commit 65e1ff2f0ad182f6bbaaa1fd67317d147384af4f

Daniel Stone 2012-03-05T15:00:39

Merge remote-tracking branch 'ran/fixes'