Commit [c2fb92]  Maximize  Restore  History

Merge branch 'upstream' into crawl

Conflicts:
pcre.h

Signed-off-by: Steven Noonan <steven@uplinklabs.net>

Steven Noonan Steven Noonan 2009-12-04