[rtpproxy/el6/master: 5/5] Merge branch 'master' into el6/master

[Peter Lemenkov]

commit a19697697afbedd58eebfa5f44d09e5063bca44e
Merge: 202746a 159a6ca
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 19 16:05:10 2010 +0400

    Merge branch 'master' into el6/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(-)
---