[upx/f13/master: 3/3] Merge branch 'f14' into f13

[Jon Ciesla]

commit 9dc964fa4978c0ac8fd09a5e77750ca30dd3e622
Merge: 37c70f9 d4ec54d
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Mon Nov 1 09:27:47 2010 -0500

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore

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