Merge branch 'master' into websocket
authorPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Sat, 7 Jul 2012 16:52:20 +0000 (17:52 +0100)
committerPeter Dunkley <peter.dunkley@crocodile-rcs.com>
Sat, 7 Jul 2012 16:52:20 +0000 (17:52 +0100)

Trivial merge