Merge branch 'bw/searching'

Pat Thoyts committed Oct 19, 2011 at 13:35 UTC ae6ec6124bb96157ca96bc90831b4874e8ad6789

No changes.