Merge branch 'master' of ssh://git.systems.ethz.ch:8092/barrelfish.acreto into shoal
authorReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 25 Nov 2014 10:01:26 +0000 (11:01 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Tue, 25 Nov 2014 10:01:26 +0000 (11:01 +0100)

Trivial merge