Merge svn changes up to r26624
commitbec3b84f5ef798ab843028dd62018571a50330ed
authorUoti Urpala <uau@symbol.nonexistent.invalid>
Thu, 1 May 2008 05:18:50 +0000 (1 08:18 +0300)
committerUoti Urpala <uau@symbol.nonexistent.invalid>
Thu, 1 May 2008 05:18:50 +0000 (1 08:18 +0300)
treea1805e73289111518e6343d255da1085736cb7f1
parent9d27862072a233b423d4a81e966b1ba9627724a6
parent19c9e0aceb9620c862cab91b509df91931821d66
Merge svn changes up to r26624

Conflicts:

Makefile
Makefile
configure
libmenu/menu_cmdlist.c