The same insidious policy is being implemented by the Canadian Border Services Agency. An escort friend of mine, travelling to Toronto from the US, had the contents of his laptop and digital camera searched in December.
I now have a netbook that I use just for travelling. It contains no files and I clear the history and temporary internet files before flying.