Merge branch 'master' into network_handler
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 24 May 2010 11:25:12 +0000 (14:25 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Mon, 24 May 2010 11:25:12 +0000 (14:25 +0300)

Trivial merge