Merge branch 'acid-burn/bug_608_add_nim_sockets_to_crashlogs' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Tue, 23 Nov 2010 13:38:32 +0000 (14:38 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 23 Nov 2010 13:38:32 +0000 (14:38 +0100)

Trivial merge