Merge remote-tracking branch 'remotes/IOMultiplexer.git/master' into development
authorpk910 <philipp@zoelle1.de>
Sat, 22 Sep 2012 04:54:22 +0000 (06:54 +0200)
committerpk910 <philipp@zoelle1.de>
Sat, 22 Sep 2012 04:54:22 +0000 (06:54 +0200)

Trivial merge