Merge branch 'feature-dtrace'
authorMark Probst <mark.probst@gmail.com>
Fri, 28 Sep 2012 21:22:40 +0000 (23:22 +0200)
committerMark Probst <mark.probst@gmail.com>
Fri, 28 Sep 2012 21:22:40 +0000 (23:22 +0200)

Trivial merge