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)
commitf067460b9a6be8c0890f6c9bbdd5a2fbf940121b
tree39bf7831b4065bef2848ddb880eba598b8c9ca01
parent4fcb78d2abb293b25727fd379f06d3ea91353ab4
parent2d1b9c2afdcb22af6e417a32fdd24c784b61c9be
Merge branch 'upstream'

Conflicts:
configure
utils/exportfs/exports.man