Merge with solr1.4 branch
authorChristos V. Stathis <chstath@ebs.gr>
Fri, 3 Dec 2010 11:16:37 +0000 (13:16 +0200)
committerChristos V. Stathis <chstath@ebs.gr>
Fri, 3 Dec 2010 11:16:37 +0000 (13:16 +0200)

Trivial merge