[jettison/el6: 16/16] Merge branch 'el5' into el6

[Sandro Mathys]

commit 1bd4bbb61b2eba0275c5c17ea368fb77af4eb16c
Merge: a566919 3211529
Author: Sandro Mathys <red at fedoraproject.org>
Date:   Sun Jan 15 17:15:47 2012 +0100

    Merge branch 'el5' into el6

 .gitignore    |    3 +--
 jettison.spec |   17 ++++++++++++++---
 sources       |    2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
---