[mercurial/f14/master: 7/9] Merge branch 'master' into f14

[Neal Becker]

commit 46abae41aed222cf04e011b87ad6689cf8661c2b
Merge: 3200970 a6bb01d
Author: Neal Becker <ndbecker2 at gmail.com>
Date:   Fri Aug 27 07:21:39 2010 -0400

    Merge branch 'master' into f14

 mercurial.spec |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)
---