[mongoose/f12/master: 5/5] Merge branch 'master' into f12

[Rafael Azenha Aquini]

commit ac5276a90cb8ea0ac3f9748afe26772f6b1b1b58
Merge: dd7defa 1a8aa87
Author: Rafael Azenha Aquini <aquini at fedoraproject.org>
Date:   Tue Sep 28 20:05:33 2010 -0300

    Merge branch 'master' into f12
    
    Conflicts:
    	mongoose-use-openssl-versioned-shlib.patch
    	mongoose.spec

 mongoose-2.11.tgz                          |  Bin 0 -> 99019 bytes
 mongoose-makefile-include-debuginfo.patch  |   13 -------
 mongoose-use-openssl-versioned-shlib.patch |   49 ++++++++++++++-------------
 mongoose.spec                              |   18 +++++-----
 4 files changed, 34 insertions(+), 46 deletions(-)
---