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

[Jan Klepek]

commit 8f3b4bf0121f6e48fafba568ecdc29bc65a61dd8
Merge: 8d96bd6 e82ebc3
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sun Jul 24 23:41:20 2011 +0200

    Merge branch 'master' into el5

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