Merge pull request #3330 from vpisarev:fix_upnp_perf
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 12 Oct 2014 04:46:26 +0000 (04:46 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 12 Oct 2014 04:46:27 +0000 (04:46 +0000)

Trivial merge