[mercurial/f13/master: 5/5] Merge branch 'master' into f13

[Neal Becker]

commit 70f1e7fd0888ea077c0dbab72f39dff02a8dcfb8
Merge: ab877db f14a596
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Mon Nov 1 19:59:35 2010 -0400

    Merge branch 'master' into f13

 .gitignore     |    1 +
 mercurial.spec |   24 ++++++++++++++++++------
 sources        |    2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)
---