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

[Alex Chernyakhovsky]

commit df045431a3fffaee984dd91e2ca5ddaf229d1b45
Merge: 8f8d2e4 751307b
Author: Alexander Chernyakhovsky <achernya at mit.edu>
Date:   Fri Apr 27 00:43:31 2012 -0400

    Merge branch 'master' into el5

 .gitignore |    1 +
 mosh.spec  |   17 ++++++++++++-----
 sources    |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---