Backport 2011-03-06T01:42:13Z!rgm@gnu.org from trunk.