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

[Ville Skyttä]

commit 173ad662e8438b0d34e1019a23ad32d8fcc8f9ad
Merge: 9bf1bb3 c55ecaf
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jan 7 22:04:49 2011 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	javasqlite.spec
    	sources

 .gitignore      |    2 +-
 javasqlite.spec |   36 +++++++++++++++++++++++++++++-------
 sources         |    2 +-
 3 files changed, 31 insertions(+), 9 deletions(-)
---