Merge svn changes up to r30264
commit0f72485ee72d23fe1ff3db39310836f776ba9f6a
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 12:52:29 +0000 (25 14:52 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Mon, 25 Jan 2010 12:52:29 +0000 (25 14:52 +0200)
tree1504ed9f7fc96b890dbb5431e19b4ef2da000822
parent8b33a04d023e858e413bf720f68b40c4297e059a
parent4e50b6df73fd6aa3e426aba796f38b9357ea457b
Merge svn changes up to r30264

Conflicts:
gui/wm/ws.c
configure
subreader.c