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

[Jan Klepek]

commit 0e8a48a83b996e8eaa27b1646dafe7f8446de790
Merge: 9fe11ad 66a3974
Author: Jan Klepek <jan.klepek at gmail.com>
Date:   Sat Jan 8 12:58:15 2011 +0100

    Merge branch 'master' into f14

 .gitignore         |    2 ++
 byobu-status.patch |   11 -----------
 byobu.spec         |   16 +++++++++-------
 sources            |    2 +-
 4 files changed, 12 insertions(+), 19 deletions(-)
---