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

[Neal Becker]

commit 51af3f2bb8b1a525a383b6b245f2177b29aefd64
Merge: d458fd6 e558705
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Sun Oct 3 12:36:05 2010 -0400

    Merge branch 'master' into f13

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