Merge 'trunk' into 'subquery'
authorRafael Kitover <rkitover@cpan.org>
Fri, 20 Feb 2009 04:57:18 +0000 (23:57 -0500)
committerRob Kinyon <rkinyon@cpan.org>
Fri, 20 Feb 2009 04:30:47 +0000 (04:30 +0000)
commite2971503ced4daeb83e37beb277f00a0ba2b5e36
tree166cd8ceb0c0b82aacfd171c6a30c443150da14f
parent78c94b91b5d9679e3a12339c903f2623882e86cd
parent76607ac83ea26dffdbede5eae7786d60b25c57a3
Merge 'trunk' into 'subquery'

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