Merge branch 'sipgate'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 14:48:11 +0000 (16:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 15 Jun 2011 14:48:11 +0000 (16:48 +0200)

Trivial merge