[pure/el6: 2/2] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 72e18a21ea2b048ae634d91f8378fcf08e4ad0c5
Merge: 984e60b 1e41035
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Mon Aug 1 03:45:42 2011 +0200

    Merge branch 'master' into el6

 pure.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---