Merge remote-tracking branch 'RobBlackwell/master'
authorOlof-Joachim Frahm <olof@macrolet.net>
Thu, 6 Jun 2013 21:05:27 +0000 (23:05 +0200)
committerOlof-Joachim Frahm <olof@macrolet.net>
Thu, 6 Jun 2013 21:05:27 +0000 (23:05 +0200)

Trivial merge