Merge branch 'shoal' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish...
authorReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 9 Dec 2014 11:42:23 +0000 (12:42 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 9 Dec 2014 11:42:23 +0000 (12:42 +0100)

Trivial merge