Merge branch 'master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Tue, 5 Mar 2013 08:16:48 +0000 (09:16 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Tue, 5 Mar 2013 08:16:48 +0000 (09:16 +0100)

Trivial merge