[skipfish/el5/master: 9/9] Merge remote-tracking branch 'origin/master' into el5/master

[rebus]

commit 7a4acaefa9bb924e2d84ac7f114a764c2690ea8d
Merge: 3da53b9 5648b98
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Mar 27 01:31:43 2011 +0100

    Merge remote-tracking branch 'origin/master' into el5/master
    
    Conflicts:
    	skipfish.spec

 skipfish.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---