Merge branch 'master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Mar 2013 12:28:03 +0000 (13:28 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 8 Mar 2013 12:28:03 +0000 (13:28 +0100)

Trivial merge