[rtpproxy/f13/master: 3/3] Merge branch 'master' into f13/master

[Peter Lemenkov]

commit e84be08ba29cc5595a98d4556bf3d7d6eeacb4fc
Merge: 941777f 159a6ca
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 19 16:00:08 2010 +0400

    Merge branch 'master' into f13/master
    
    Conflicts:
    	.gitignore

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