[openjpeg/f12/master: 12/12] Merge remote branch 'origin/master' into f12/master

[Rex Dieter]

commit 01b7bd95bd8b0e0dc14200834d68ec74fc0d593e
Merge: 7e7794c c97d503
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Nov 23 11:06:05 2010 -0600

    Merge remote branch 'origin/master' into f12/master
    
    Conflicts:
    	.gitignore

 .gitignore                                  |    1 +
 openjpeg-1.3-libm.patch                     |   54 +--------------
 openjpeg-svn501-create0-calloc.patch        |   14 ++++
 openjpeg-svn505-jp2_decode-NULL-deref.patch |   13 ++++
 openjpeg.spec                               |  103 +++++++++++++++++++++------
 sources                                     |    1 +
 6 files changed, 110 insertions(+), 76 deletions(-)
---