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

[Jan Klepek]

commit 6bde2ec2aff4a8b08b4779fc6f45704b80cd939f
Merge: 9251860 e82ebc3
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sun Jul 24 23:40:53 2011 +0200

    Merge branch 'master' into f14

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