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

[Neal Becker]

commit 0997135e7d55529b58e2cdb3ea9fa2ecf5eb0944
Merge: 910f866 42cbfe3
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Sun Jan 2 14:21:24 2011 -0500

    Merge branch 'master' into f13

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