Merge branch 'adaptercomm'. bugzid: 654
authorLars Op den Kamp <lars@opdenkamp.eu>
Sun, 15 Apr 2012 19:59:50 +0000 (21:59 +0200)
committerLars Op den Kamp <lars@opdenkamp.eu>
Sun, 15 Apr 2012 20:03:19 +0000 (22:03 +0200)

Trivial merge