Merge branch 'upstream'
authorBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:38:03 +0000 (02:38 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Wed, 14 Jul 2010 01:38:03 +0000 (02:38 +0100)
Conflicts:
configure

1  2 
utils/exportfs/exports.man

Simple merge