Colin Walters 5afcf07782 Merge branch 'workspace-salon' ... Conflicts: src/shell-global.c svn path=/trunk/; revision=152		2009-01-19 23:06:59 +00:00
..
ui	Merge branch 'workspace-salon'	2009-01-19 23:06:59 +00:00