[exo/el6: 3/3] Merge remote-tracking branch 'origin/master' into el6

[Orion Poplawski]

commit 16e4cbf52afebdc1db32e1db4a05187bb4ac510e
Merge: f6ac0ac 472e2a1
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jul 21 17:01:23 2011 -0600

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

 .gitignore |    1 +
 exo.spec   |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---