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

[Neal Becker]

commit 233251af2b0e1c772835a93efc7717db72960850
Merge: ccd5a3d 493afb2
Author: nbecker <ndbecker2 at gmail.com>
Date:   Sat Aug 27 09:14:22 2011 -0400

    Merge branch 'master' into f14

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