[hekafs/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Kaleb S. KEITHLEY]

commit 22bc9e5cbec0ea731b68dd71335c553582daf427
Merge: a2f3fda 33488b2
Author: Kaleb KEITHLEY <kkeithle at redhat.com>
Date:   Tue Jan 3 14:48:31 2012 -0500

    Merge remote-tracking branch 'origin/master' into el6

 hekafs.spec |    6 +++++-
 sources     |    2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
---