Merge remote branch 'origin/acid-burn/bug_608_add_nim_sockets_to_crashlogs'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 18 Jan 2011 09:42:39 +0000 (10:42 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 18 Jan 2011 09:42:39 +0000 (10:42 +0100)

Trivial merge