[mod_gnutls/f16: 4/4] Merge branch 'master' into f16

[jkastner]

commit 8460d1e1d745a4c3170479c4c76310dbfdb1f253
Merge: 48aefc6 488b3c8
Author: Jiri Kastner <jkastner at redhat.com>
Date:   Mon Mar 19 15:47:06 2012 +0100

    Merge branch 'master' into f16

 mod_gnutls.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---