Merge branch 'v4.6.x' of git.sv.gnu.org:/srv/git/xboard
authorH.G. Muller <h.g.muller@hccnet.nl>
Fri, 2 Mar 2012 11:31:32 +0000 (12:31 +0100)
committerH.G. Muller <h.g.muller@hccnet.nl>
Fri, 2 Mar 2012 11:31:32 +0000 (12:31 +0100)

Trivial merge