Merge "Make tmpfile always there as a import option, plus some small cleanup" into...
authorYugang Fan <yugang.fan@intel.com>
Sun, 9 Jun 2013 04:56:37 +0000 (13:56 +0900)
committerGerrit Code Review <gerrit2@kim11>
Sun, 9 Jun 2013 04:56:37 +0000 (13:56 +0900)

Trivial merge