tree 819a4a6a1ca6edfac432170502e2d3b9aaa0abe7
parent 8eeeefccffb5e06107cd444436cc229f282a2b72
author Andy McFadden <fadden@android.com> 1241545551 -0700
committer Andy McFadden <fadden@android.com> 1241545551 -0700

Pull fix from master branch, and correct filename juggling.

The original fix was in p4 144906.  This also corrects some problems that
arise when the temp file is specified.