[mosh/el5: 2/2] Merge branch 'master' into el5

[Alex Chernyakhovsky]

commit f84cec924b9abc18d306aacedf4d027ac8e1a479
Merge: e0277a6 a3be165
Author: Alexander Chernyakhovsky <achernya at mit.edu>
Date:   Sat Apr 28 13:49:41 2012 -0400

    Merge branch 'master' into el5

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