[byobu/el6: 2/2] Merge branch 'master' into el6

[Jan Klepek]

commit c4df7c00b2a9d7fcb1d16dd7a7514e12a9a0f0ef
Merge: c18d749 e82ebc3
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sun Jul 24 23:41:49 2011 +0200

    Merge branch 'master' into el6

 byobu.spec |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)
---