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

[Neal Becker]

commit 533fc6c0c653ff46e8ca0898141517d514bea55a
Merge: 5447ce6 42cbfe3
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Sun Jan 2 14:10:45 2011 -0500

    Merge branch 'master' into f14

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