[mercurial/f16: 2/2] Merge branch 'master' into f16

[Neal Becker]

commit ebd08f472318e3e7a6e5bdd3cdb9335c7eab106d
Merge: e3c1b35 6168dac
Author: nbecker <ndbecker2 at gmail.com>
Date:   Sun Oct 2 13:56:42 2011 -0400

    Merge branch 'master' into f16

 mercurial.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---