[javasqlite/el6/master: 12/12] Merge branch 'master' into el6

[Ville Skyttä]

commit 80d8575bab7c27cd6f3a340fb47722acd5be86ea
Merge: 173ad66 e5b3460
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Jan 12 21:34:36 2011 +0200

    Merge branch 'master' into el6

 ...water-handling-of-SQLite.Database.-status.patch |   36 ++++++++++++++++++++
 javasqlite.spec                                    |   28 ++++++++++++++--
 2 files changed, 61 insertions(+), 3 deletions(-)
---