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

[Rafael Azenha Aquini]

commit e75d73a8d64da2954822662f4881e6bf8014149f
Merge: d4ee372 1a8aa87
Author: Rafael Azenha Aquini <aquini at fedoraproject.org>
Date:   Tue Sep 28 19:58:48 2010 -0300

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

 mongoose-2.11.tgz                          |  Bin 0 -> 99019 bytes
 mongoose-use-openssl-versioned-shlib.patch |   49 ++++++++++++++-------------
 mongoose.spec                              |   18 +++++-----
 3 files changed, 34 insertions(+), 33 deletions(-)
---