Merge remote branch 'remotes/origin/bug_609_packetmanager_fixes'
authorghost <[email protected]>
Mon, 15 Nov 2010 12:19:58 +0000 (13:19 +0100)
committerghost <[email protected]>
Mon, 15 Nov 2010 12:19:58 +0000 (13:19 +0100)

Trivial merge