[icecream/el6/master: 12/12] Merge branch 'master' into el6

[Michal Schmidt]

commit 4451ba1140c66be1dd99d25b338836e8e2667821
Merge: d1ff047 019251f
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Tue Aug 3 15:38:33 2010 +0200

    Merge branch 'master' into el6
    
    Update to 0.9.6.
    
    Conflicts:
    	.gitignore
    	icecream-rename-scheduler.patch
    	icecream.spec
    	sources

 .gitignore                                       |    2 +-
 icecream-fix-createenv-when-ldconfig-fails.patch |   32 ----------------------
 icecream-rename-scheduler.patch                  |   30 ++++++++------------
 icecream.spec                                    |   16 ++++++-----
 sources                                          |    2 +-
 5 files changed, 23 insertions(+), 59 deletions(-)
---