Merge branch 'newsearch'
authorMichael M Slusarz <slusarz@curecanti.org>
Tue, 25 Aug 2009 05:25:05 +0000 (23:25 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Tue, 25 Aug 2009 05:25:05 +0000 (23:25 -0600)

Trivial merge