[mercurial/f14: 17/17] Merge branch 'master' into f14

[Neal Becker]

commit 5ffa3bfcabe700c8be375e2cfc45ec08b4d7f9fb
Merge: 5ed370e ebc7bd9
Author: nbecker <ndbecker2 at gmail.com>
Date:   Thu Jun 2 11:17:10 2011 -0400

    Merge branch 'master' into f14

 .gitignore         |    1 +
 docutils-0.8.patch |   25 +++++++++++++++++++++++++
 mercurial.spec     |   12 ++++++++++--
 sources            |    2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)
---