Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 7 Mar 2013 12:16:41 +0000 (13:16 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 7 Mar 2013 12:16:41 +0000 (13:16 +0100)

Trivial merge