Merge remote branch 'amdragon/search-perf-3'
authorCarl Worth <cworth@cworth.org>
Thu, 10 Mar 2011 19:05:49 +0000 (11:05 -0800)
committerCarl Worth <cworth@cworth.org>
Thu, 10 Mar 2011 19:05:49 +0000 (11:05 -0800)

Trivial merge