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

Trivial merge