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

[Neal Becker]

commit ccd5a3d28c339f842aa6f4b1bf51a0844e954ca4
Merge: 5ffa3bf af82303
Author: nbecker <ndbecker2 at gmail.com>
Date:   Sat Jul 2 17:23:08 2011 -0400

    Merge branch 'master' into f14

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