Merge 'trunk' into 'subquery'
Rafael Kitover [Fri, 20 Feb 2009 04:57:18 +0000 (23:57 -0500)]
r5544@rkinyon-lt-osx (orig r5543):  caelum | 2009-02-19 22:57:18 -0500
added timeout to sqlite health check because some buggy versions of sqlite just hang


Trivial merge