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

[Neal Becker]

commit ce7a3d7c9a15a00b78aa3bcae2afcfa051bae55a
Merge: 310fd58 6290479
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Sun Mar 20 08:17:22 2011 -0400

    Merge branch 'master' into f13

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