Merge 'trunk' into 'multi_stuff'
Rafael Kitover [Fri, 20 Feb 2009 09:57:18 +0000 (09:57 +0000)]
r27882@agaton (orig r5543):  caelum | 2009-02-20 03:57:18 +0000
added timeout to sqlite health check because some buggy versions of sqlite just hang

1  2 
Makefile.PL

diff --cc Makefile.PL
Simple merge