[skipfish/f14/master: 5/5] Merge remote-tracking branch 'origin/master' into f14/master

[rebus]

commit d3a3bf6d50649981f75ebc7cb150994090ef481d
Merge: 9a0f0d4 5648b98
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Sun Mar 27 01:26:37 2011 +0100

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

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