Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread