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

[Neal Becker]

commit 4d41794a5cc909fb40b83b17b178538ebc747547
Merge: 66cab2d 397992d
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Thu Aug 26 14:41:51 2010 -0400

    Merge branch 'master' into f13

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