[upx/f12/master: 9/9] Merge branch 'f13' into f12

[Jon Ciesla]

commit fb99dcb5ff141cd384f1a2bf188bf5760321c6ae
Merge: 0206bec 9dc964f
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Nov 1 09:33:54 2010 -0500

    Merge branch 'f13' into f12
    
    Conflicts:
    	.gitignore
    	sources
    	upx.spec

 sources  |    2 +-
 upx.spec |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---