From: Rafael Kitover <rkitover@cpan.org>
Date: Fri, 20 Feb 2009 09:57:18 +0000 (+0000)
Subject: Merge 'trunk' into 'multi_stuff'
X-Git-Tag: v0.08240~94^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f466f65bc9bc276da0ae840d661c4bab11495837;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'multi_stuff'

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
---

f466f65bc9bc276da0ae840d661c4bab11495837