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

[Neal Becker]

commit 310fd584efd2db334cfa1e7d359db0befd9571aa
Merge: f2c0ab8 bd336b6
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Wed Mar 2 08:13:26 2011 -0500

    Merge branch 'master' into f13

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