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

Trivial merge