[opensips/f16: 2/2] Merge branch 'master' into f16

[Peter Lemenkov]

commit 20cf49ea004c67aeb12483c89d92399eff35a16e
Merge: 3039a18 56e4539
Author: Fedora Build <lemenkov at gmail.com>
Date:   Sat Aug 18 17:38:33 2012 +0400

    Merge branch 'master' into f16

 opensips.spec |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 deletions(-)
---