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

Trivial merge