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

[Thomas Moschny]

commit e65e7f85c7267c6a6467c06119e8f83bc30d57a6
Merge: 4d4b306 a3a5661
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Thu Oct 28 01:52:29 2010 +0200

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

 .gitignore                  |    1 +
 monotone-sqlite-3.7.3.patch |   48 +++++++++++++++++++++++++++++++++++++++++++
 monotone.spec               |    8 ++++++-
 sources                     |    2 +-
 4 files changed, 57 insertions(+), 2 deletions(-)
---