[audex: 7/7] Merge changes from F13 to ensure devel branch has bigger NVR.

[Adam Tkac]

commit 8b44bb19b67ee981b4c0088b0f50457f7dee61ea
Merge: 63f8267 63ba0b4
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Aug 20 15:01:51 2010 +0200

    Merge changes from F13 to ensure devel branch has bigger NVR.
    
    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	audex.spec
    	sources
    
    Signed-off-by: Adam Tkac <atkac at redhat.com>

 audex.spec |    4 ++--
 sources    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---