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

[Orion Poplawski]

commit f0fde00d4d6aa0525fe3b5d99d4631c31bb09f33
Merge: 79d20c4 16fdb8c
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jul 21 17:14:37 2011 -0600

    Merge branch 'master' into el6

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