[opensips/el6: 16/16] Merge branch 'el5' into el6

[John A. Khvatov]

commit 944377380739b6d7a6431fa45c0de09812c23464
Merge: 76c2d7f f1028c3
Author: John Khvatov <ivaxer at sgu.ru>
Date:   Mon Nov 7 03:40:02 2011 +0400

    Merge branch 'el5' into el6
    
    Conflicts:
    	opensips.spec

 .gitignore                                         |    1 +
 ...ps-0001-Check-for-stale-nonce-in-pre_auth.patch |    2 +-
 ...overlapping-both-auth-realm-and-auth-resp.patch |   29 --------
 opensips.spec                                      |   74 +++++++++++++++++---
 sources                                            |    2 +-
 5 files changed, 68 insertions(+), 40 deletions(-)
---