Merge remote branch 'origin/wi2nlog'
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 1 Feb 2011 12:51:39 +0000 (13:51 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Tue, 1 Feb 2011 12:51:39 +0000 (13:51 +0100)

Trivial merge