[exo/el6: 2/4] Merge branch 'master' into el6

[Orion Poplawski]

commit 79d20c4217df713f1b10beec8b26d51f0a5e595c
Merge: 16e4cbf 7cd6860
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jul 21 17:13:48 2011 -0600

    Merge branch 'master' into el6

 exo.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---