Merge commit 'master-20091122' into gtk
authorArun Persaud <arun@nubati.net>
Sat, 9 Jan 2010 22:17:21 +0000 (14:17 -0800)
committerArun Persaud <arun@nubati.net>
Sat, 9 Jan 2010 22:17:21 +0000 (14:17 -0800)
commit2dee3c0dc5b669d4e5f3464866b056a5bbca252e
tree6f779ca78db9997f3a237ba884b759424b16fb65
parentf492ab86d8d68a4391c6214c050fcc6c77bd11c0
parent74113c74ca3c2294082fcf9dc87e2af8f991c3cc
Merge commit 'master-20091122' into gtk

Conflicts:
backend.c
configure.ac
xboard.c
xengineoutput.c
xhistory.c
Makefile.am
backend.c
configure.ac
frontend.h
xboard.c
xhistory.c