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

[Neal Becker]

commit d29053c9a4ec719436c537c7daad6c7271de9504
Merge: 21b4076 6290479
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Sun Mar 20 08:10:19 2011 -0400

    Merge branch 'master' into f14

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