Merge branch 'master' of ssh://code.systems.ethz.ch:8006/diffusion/BFI/barrelfish
authorReto Achermann <reto.achermann@inf.ethz.ch>
Mon, 12 Jan 2015 16:07:46 +0000 (17:07 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Mon, 12 Jan 2015 16:07:46 +0000 (17:07 +0100)

Trivial merge