[rtpproxy/el4/master: 16/16] Merge branch 'master' into el4/master

[Peter Lemenkov]

commit 4d215962e4cbb8696307276090ce4b1841a490fe
Merge: 7cf9c2a 159a6ca
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 19 16:10:31 2010 +0400

    Merge branch 'master' into el4/master
    
    Conflicts:
    	.gitignore
    	rtpproxy.spec

 .gitignore                                         |    1 +
 ...-users-write-to-the-controlling-UNIX-sock.patch |   31 ++++++++++++++++++++
 rtpproxy.spec                                      |    9 ++++-
 3 files changed, 39 insertions(+), 2 deletions(-)
---