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

[rebus]

commit c10b413d5067fc1e7728a023163b4449a326ef98
Merge: 3ea43b5 5648b98
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Mar 27 01:30:21 2011 +0100

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

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