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

[Neal Becker]

commit fc4afc0b5799c72743d95d654251e21880b96c14
Merge: ebd08f4 7abb7b6
Author: nbecker <ndbecker2 at gmail.com>
Date:   Tue Oct 11 18:57:11 2011 -0400

    Merge branch 'master' into f16

 mercurial.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---