[icecream/f13/master: 7/7] Merge branch 'el5' into f13

[Michal Schmidt]

commit c89411340e049c7bda9e1fe8daceceb1605066cb
Merge: 3314a58 a6617ad
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Mon Aug 16 18:16:12 2010 +0200

    Merge branch 'el5' into f13
    
    only formal merge, to make subsequent merges f13->el5 fast-forward.
    no real change.

 icecream.spec |    1 -
 icecream.te   |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)
---