am bd1578fb: (-s ours) am eb4d5b25: Merge "recovery just takes a filename as...
am bd1578fb: (-s ours) am eb4d5b25: Merge "recovery just takes a filename as an argument now (do not merge)" into gingerbread
Merge commit 'bd1578fb'
* commit 'bd1578fb':
recovery just takes a filename as an argument now (do not merge)