[liblinebreak/el6: 7/7] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit eaa619c7fed6166fdd886a77d273ae144da929f4
Merge: 26be917 5274364
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Jul 15 09:08:57 2011 +0200

    Merge branch 'master' into el6

 .gitignore        |    2 +-
 liblinebreak.spec |    8 +++++++-
 sources           |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---