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

[Neal Becker]

commit fda6a778cdc12c925e90ff8029bd2fa28fe8cbab
Merge: 46abae4 e558705
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Sun Oct 3 12:35:04 2010 -0400

    Merge branch 'master' into f14

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