Merge ssh://git-x.eng.vmware.com/git/opensource/open-vm-tools into yiwen-patches

diff --cc open-vm-tools/lib/include/guestApp.h
Simple merge

diff --cc open-vm-tools/toolbox/Makefile.in
Simple merge

diff --cc open-vm-tools/toolbox/toolbox-cmd.c
index fceea2b46e34a281c228993692ea893937679d70,36aa8cf67df4950a0057a43471eed7aafc5c91c5..de22556647e2ce4772b7bc06c9527105e347ddcf
--- 1/open-vm-tools/toolbox/toolbox-cmd.c
--- 2/open-vm-tools/toolbox/toolbox-cmd.c
+++ b/open-vm-tools/toolbox/toolbox-cmd.c
@@@ -77,9 -83,8 +84,9 @@@ static void DiskHelp(char *progName)
  static void ScriptHelp(char *progName);
  static void StatHelp(char *progName);
  static void TimeSyncHelp(char *progName);
 +static void RecordHelp(char *progName);
  static void ToolboxCmdHelp(char *progName);
- static const CmdTable * ParseCommand(char **argv, int argc);
+ static CmdTable *ParseCommand(char **argv, int argc);
  static Bool CheckArgumentLength(char **argv, int argc);
  
  

diff --cc open-vm-tools/toolbox/toolbox-gtk.c
Simple merge

diff --cc open-vm-tools/toolbox/toolboxCmdInt.h
Simple merge