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

[Neal Becker]

commit 21b4076fb92b8ed29367513566af8ba9ad79794e
Merge: fe5853f bd336b6
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Wed Mar 2 08:07:55 2011 -0500

    Merge branch 'master' into f14

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