Merge remote-tracking branch 'IOMultiplexer.git/master' into development
authorpk910 <philipp@zoelle1.de>
Wed, 13 Feb 2013 19:18:13 +0000 (20:18 +0100)
committerpk910 <philipp@zoelle1.de>
Wed, 13 Feb 2013 19:18:13 +0000 (20:18 +0100)

Trivial merge