DESCRIPTION

Some import cleanups.

Change-Id: I54bdc264566684208e5273ce51d56f38d14be852


COMMENTS

author: Andreas Short
date: 2011-01-11 23:20:41.406000000

Patch Set 1: Verified; Looks good to me, approved

Sorry for the delay.  My testing lead to spurious failures which I wanted to get to the bottom of before letting this commit and the dependent through.

-------------------------------------
author: Andreas Short
date: 2011-01-11 23:20:41.582000000

Change has been successfully cherry-picked as 9f1b6301200aca9ea889c969930d999df74a0bad.

-------------------------------------
