Imported Upstream version 2.1.4-dfsgupstream/2.1.4-dfsg

88 files changed, 361 insertions, 90 deletions

diff --git a/src/VBox/Additions/Makefile.kmk b/src/VBox/Additions/Makefile.kmk
index d2e013fbd..c29d35b5e 100644
--- a/src/VBox/Additions/Makefile.kmk
+++ b/src/VBox/Additions/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 15986 2009-01-16 10:10:12Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Top-level makefile for the VirtualBox Guest Additions.
 #
diff --git a/src/VBox/Additions/common/Makefile.kmk b/src/VBox/Additions/common/Makefile.kmk
index bf11f39aa..b456e2cf5 100644
--- a/src/VBox/Additions/common/Makefile.kmk
+++ b/src/VBox/Additions/common/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 14347 2008-11-19 11:32:30Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the common addition code.
 #
diff --git a/src/VBox/Additions/common/VBoxControl/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/Makefile.kmk
index d90b931d3..dee9d172e 100644
--- a/src/VBox/Additions/common/VBoxControl/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxControl/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 14220 2008-11-14 15:05:30Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the Guest Additions Command Line Management Interface.
 #
diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
index c2ef3df19..8ea0e29a9 100644
--- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
+++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxControl.cpp 16152 2009-01-21 17:22:59Z vboxsync $ */
+/** $Id: VBoxControl.cpp $ */
 /** @file
  * VBoxControl - Guest Additions Command Line Management Interface
  */
diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp
index 847044616..babb7e839 100644
--- a/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp
+++ b/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxControlSVN.cpp 10099 2008-07-02 12:40:08Z vboxsync $ */
+/* $Id: VBoxControlSVN.cpp $ */
 /** @file
  * VBoxControl - Guest Additions Command Line Management Interface
  * SVN revision.
diff --git a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
index 8ae7d3d78..0ec0c73fb 100644
--- a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 14233 2008-11-17 07:32:42Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the VBoxControl testcases.
 #
diff --git a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
index a28b9887e..b3aa5b2f4 100644
--- a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
+++ b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp
@@ -1,4 +1,4 @@
-/** $Id: tstVBoxControl.cpp 14233 2008-11-17 07:32:42Z vboxsync $ */
+/** $Id: tstVBoxControl.cpp $ */
 /** @file
  * VBoxControl - Guest Additions Command Line Management Interface, test case
  */
diff --git a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
index 5284b0263..40ad23c7e 100644
--- a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 16013 2009-01-17 23:58:41Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Makefile for the Cross Platform Guest Additions Driver.
 #
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
index a1f7efda6..82ded64f6 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuest-freebsd.c 8250 2008-04-21 18:42:58Z vboxsync $ */
+/* $Id: VBoxGuest-freebsd.c $ */
 /** @file
  * VirtualBox Guest Additions Driver for FreeBSD.
  */
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp
index aec6fff62..54d718cb6 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuest-os2.cpp 14297 2008-11-18 12:40:43Z vboxsync $ */
+/* $Id: VBoxGuest-os2.cpp $ */
 /** @file
  * VBoxGuest - OS/2 specifics.
  */
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def
index b44c50edc..d41ee37de 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def
@@ -1,4 +1,4 @@
-; $Id: VBoxGuest-os2.def 8155 2008-04-18 15:16:47Z vboxsync $
+; $Id: VBoxGuest-os2.def $
 ;; @file
 ; VBoxGuest - OS/2 definition file.
 ;
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
index 664493a48..9b1b9f826 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuest-solaris.c 14203 2008-11-14 11:04:50Z vboxsync $ */
+/* $Id: VBoxGuest-solaris.c $ */
 /** @file
  * VirtualBox Guest Additions Driver for Solaris.
  */
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
index 788bbe11d..68c939e4a 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuest.cpp 14462 2008-11-21 14:17:21Z vboxsync $ */
+/* $Id: VBoxGuest.cpp $ */
 /** @file
  * VBoxGuest - Guest Additions Driver.
  */
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm
index 8106612e0..0720186d6 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm
@@ -1,4 +1,4 @@
-; $Id: VBoxGuestA-os2.asm 8155 2008-04-18 15:16:47Z vboxsync $
+; $Id: VBoxGuestA-os2.asm $
 ;; @file
 ; VBoxGuest - OS/2 assembly file, the first file in the link.
 ;
diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h
index 7b414fdeb..f836c5149 100644
--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h
+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestInternal.h 11820 2008-08-29 14:09:39Z vboxsync $ */
+/* $Id: VBoxGuestInternal.h $ */
 /** @file
  * VBoxGuest - Guest Additions Driver.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
index 4034f4553..b08ea9800 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the common guest addition code library.
 #
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h
index a119f5f14..7760f8aee 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h
@@ -1,4 +1,4 @@
-/* $Id: VBGLR3Internal.h 10797 2008-07-22 08:12:42Z vboxsync $ */
+/* $Id: VBGLR3Internal.h $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 support library for the guest additions, Internal header.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
index 9c9e75685..a6250d9db 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestR3Lib.cpp 14217 2008-11-14 14:51:23Z vboxsync $ */
+/* $Id: VBoxGuestR3Lib.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Core.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
index 299b2c1e8..274d22e4b 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestR3LibClipboard.cpp 10552 2008-07-11 20:05:12Z vboxsync $ */
+/* $Id: VBoxGuestR3LibClipboard.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Clipboard.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp
index a2764c557..713f92813 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxGuestR3LibDaemonize.cpp 11179 2008-08-06 14:45:17Z vboxsync $ */
+/** $Id: VBoxGuestR3LibDaemonize.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, daemonize a process.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp
index 894e480c4..b4806909d 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestR3LibGR.cpp 10553 2008-07-11 20:11:27Z vboxsync $ */
+/* $Id: VBoxGuestR3LibGR.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, GR.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
index ad3bab04a..4aa25ffc4 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestR3LibGuestProp.cpp 14359 2008-11-19 16:27:41Z vboxsync $ */
+/* $Id: VBoxGuestR3LibGuestProp.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions,
  * guest properties.
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
index 9b60c06cf..969207a89 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestR3LibMisc.cpp 10638 2008-07-15 10:01:32Z vboxsync $ */
+/* $Id: VBoxGuestR3LibMisc.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Misc.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp
index 9b8de26c2..01b05e8dd 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp
@@ -1,4 +1,4 @@
-/* $Id: VBoxGuestR3LibMouse.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */
+/* $Id: VBoxGuestR3LibMouse.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Mouse.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
index ee59a5075..5c15891cf 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxGuestR3LibSeamless.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */
+/** $Id: VBoxGuestR3LibSeamless.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Seamless mode.
  */
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp
index 68034bd9d..8cd2425f6 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxGuestR3LibTime.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */
+/** $Id: VBoxGuestR3LibTime.cpp $ */
 /** @file
  * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Time.
  */
diff --git a/src/VBox/Additions/common/VBoxService/Makefile.kmk b/src/VBox/Additions/common/VBoxService/Makefile.kmk
index 9d8bb1a56..0394ad06f 100644
--- a/src/VBox/Additions/common/VBoxService/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxService/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 16014 2009-01-18 00:04:12Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the Cross Platform Guest Addition Services.
 #
diff --git a/src/VBox/Additions/common/VBoxService/VBoxService.cpp b/src/VBox/Additions/common/VBoxService/VBoxService.cpp
index 19ea045f4..dfdc01b48 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxService.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxService.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxService.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */
+/** $Id: VBoxService.cpp $ */
 /** @file
  * VBoxService - Guest Additions Service Skeleton.
  */
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
index d1ac03dc5..f161de99d 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxServiceClipboard-os2.cpp 8580 2008-05-05 13:56:33Z vboxsync $ */
+/** $Id: VBoxServiceClipboard-os2.cpp $ */
 /** @file
  * VBoxService - Guest Additions Clipboard Service, OS/2.
  */
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h
index 539c00a81..802147469 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h
@@ -1,4 +1,4 @@
-/* $Id: VBoxServiceInternal.h 8155 2008-04-18 15:16:47Z vboxsync $ */
+/* $Id: VBoxServiceInternal.h $ */
 /** @file
  * VBoxService - Guest Additions Services.
  */
diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp
index 234ca4098..8d2064d75 100644
--- a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp
+++ b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp
@@ -1,4 +1,4 @@
-/** $Id: VBoxServiceTimeSync.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */
+/** $Id: VBoxServiceTimeSync.cpp $ */
 /** @file
  * VBoxService - Guest Additions TimeSync Service.
  */
diff --git a/src/VBox/Additions/freebsd/Installer/vboxguest.sh b/src/VBox/Additions/freebsd/Installer/vboxguest.sh
index 367dea0a0..367dea0a0 100644..100755
--- a/src/VBox/Additions/freebsd/Installer/vboxguest.sh
+++ b/src/VBox/Additions/freebsd/Installer/vboxguest.sh
diff --git a/src/VBox/Additions/freebsd/Makefile.kmk b/src/VBox/Additions/freebsd/Makefile.kmk
index 453884a24..7b2d9e771 100644
--- a/src/VBox/Additions/freebsd/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the FreeBSD guest additions base directory.
 #
diff --git a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
index 0e9c429c8..2267096cb 100644
--- a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
+++ b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the FreeBSD Shared folder kernel module.
 #
diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
index 382099fd3..789a31835 100644
--- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
+++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs.h 8250 2008-04-21 18:42:58Z vboxsync $ */
+/* $Id: vboxvfs.h $ */
 /** @file
  * Description.
  */
diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
index 7853972ba..6ea7d173d 100644
--- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
+++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs_vfsops.c 13835 2008-11-05 02:34:43Z vboxsync $ */
+/* $Id: vboxvfs_vfsops.c $ */
 /** @file
  * Description.
  */
diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
index 1cef32fa6..9746382f2 100644
--- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
+++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs_vnops.c 8155 2008-04-18 15:16:47Z vboxsync $ */
+/* $Id: vboxvfs_vnops.c $ */
 /** @file
  * Description.
  */
diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk
index ce0f192c8..19e15a560 100644
--- a/src/VBox/Additions/linux/Makefile.kmk
+++ b/src/VBox/Additions/linux/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 16091 2009-01-20 16:53:58Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Makefile for the linux guest additions base directory.
 #
@@ -89,6 +89,7 @@ $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \
 		$(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids \
 		$(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \
 		$(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl \
+		$(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15suse.pl \
 		$(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test \
 		$(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c \
 		$(PATH_BIN)/additions/vboxmouse_drv.o \
@@ -142,6 +143,7 @@ $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \
 	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids         $(VBOX_LNX_ADD_INS_OUT_DIR)
 	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl          $(VBOX_LNX_ADD_INS_OUT_DIR)
 	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl        $(VBOX_LNX_ADD_INS_OUT_DIR)
+	$(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15suse.pl    $(VBOX_LNX_ADD_INS_OUT_DIR)
 	$(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi    $(VBOX_LNX_ADD_INS_OUT_DIR)
 	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o       $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv.o
 	$(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so           $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so
diff --git a/src/VBox/Additions/linux/daemon/Makefile.kmk b/src/VBox/Additions/linux/daemon/Makefile.kmk
index 40e668fad..e4f189686 100644
--- a/src/VBox/Additions/linux/daemon/Makefile.kmk
+++ b/src/VBox/Additions/linux/daemon/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the VirtualBox Linux Guest Addition Linux Daemon.
 #
diff --git a/src/VBox/Additions/linux/installer/90-vboxguest.fdi b/src/VBox/Additions/linux/installer/90-vboxguest.fdi
index dad367255..15361cc34 100644
--- a/src/VBox/Additions/linux/installer/90-vboxguest.fdi
+++ b/src/VBox/Additions/linux/installer/90-vboxguest.fdi
@@ -2,7 +2,7 @@
 <!--
 # Sun xVM VirtualBox
 # Hal driver description for the vboxmouse driver
-# $Id: 90-vboxguest.fdi 12283 2008-09-09 10:19:10Z vboxsync $
+# $Id: 90-vboxguest.fdi 36284 2008-09-09 10:19:10Z mt221433 $
 
      Copyright (C) 2008 Sun Microsystems, Inc.
 
diff --git a/src/VBox/Additions/linux/installer/vboxadd-timesync.sh b/src/VBox/Additions/linux/installer/vboxadd-timesync.sh
index e0bdc9bc8..e0bdc9bc8 100644..100755
--- a/src/VBox/Additions/linux/installer/vboxadd-timesync.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd-timesync.sh
diff --git a/src/VBox/Additions/linux/installer/vboxadd.sh b/src/VBox/Additions/linux/installer/vboxadd.sh
index 64911170b..64911170b 100644..100755
--- a/src/VBox/Additions/linux/installer/vboxadd.sh
+++ b/src/VBox/Additions/linux/installer/vboxadd.sh
diff --git a/src/VBox/Additions/linux/module/Makefile.kmk b/src/VBox/Additions/linux/module/Makefile.kmk
index 06a1fa9de..e1875f247 100644
--- a/src/VBox/Additions/linux/module/Makefile.kmk
+++ b/src/VBox/Additions/linux/module/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 15589 2008-12-16 14:24:08Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the VirtualBox Linux Guest Additions Kernel Module.
 #
diff --git a/src/VBox/Additions/linux/module/files_vboxadd b/src/VBox/Additions/linux/module/files_vboxadd
index 52e01bfae..52e01bfae 100644..100755
--- a/src/VBox/Additions/linux/module/files_vboxadd
+++ b/src/VBox/Additions/linux/module/files_vboxadd
diff --git a/src/VBox/Additions/linux/module/vboxmod.c b/src/VBox/Additions/linux/module/vboxmod.c
index 7709ee66a..18ad9f1a8 100644
--- a/src/VBox/Additions/linux/module/vboxmod.c
+++ b/src/VBox/Additions/linux/module/vboxmod.c
@@ -350,7 +350,6 @@ static int vboxadd_hgcm_disconnect(struct file *filp, unsigned long userspace_in
             rc = -EFAULT;
         }
         if (rc >= 0) {
-            LogRelFunc(("client ID %u\n", info.u32ClientID));
             vrc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_DISCONNECT,
                                    &info);
             rc = -RTErrConvertToErrno(vrc);
@@ -551,7 +550,6 @@ static int vboxadd_hgcm_call(unsigned long userspace_info, uint32_t u32Size)
         }
         if (rc >= 0) {
                 int vrc;
-                LogRelFunc(("client ID %u\n", pInfo->u32ClientID));
                 vrc = vboxadd_cmc_call(vboxDev,
                               VBOXGUEST_IOCTL_HGCM_CALL(u32Size), pInfo);
                 rc = -RTErrConvertToErrno(vrc);
@@ -611,7 +609,6 @@ static int vboxadd_hgcm_call_timed(unsigned long userspace_info,
         }
         if (rc >= 0) {
                 int vrc;
-                LogRelFunc(("client ID %u\n", pInfo->info.u32ClientID));
                 pInfo->fInterruptible = true;  /* User space may not do uninterruptible waits */
                 vrc = vboxadd_cmc_call(vboxDev,
                               VBOXGUEST_IOCTL_HGCM_CALL_TIMED(u32Size), pInfo);
diff --git a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
index 1069e647b..7561e86d3 100644
--- a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
+++ b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 15589 2008-12-16 14:24:08Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the vboxvfs (linux shared folders module).
 #
diff --git a/src/VBox/Additions/linux/sharedfolders/files_vboxvfs b/src/VBox/Additions/linux/sharedfolders/files_vboxvfs
index f47c2a61c..f47c2a61c 100644..100755
--- a/src/VBox/Additions/linux/sharedfolders/files_vboxvfs
+++ b/src/VBox/Additions/linux/sharedfolders/files_vboxvfs
diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c
index bac5db8da..53d94f251 100644
--- a/src/VBox/Additions/linux/sharedfolders/regops.c
+++ b/src/VBox/Additions/linux/sharedfolders/regops.c
@@ -122,9 +122,7 @@ sf_reg_write (struct file *file, const char *buf, size_t size, loff_t *off)
         struct sf_inode_info *sf_i = GET_INODE_INFO (inode);
         struct sf_glob_info *sf_g = GET_GLOB_INFO (inode->i_sb);
         struct sf_reg_info *sf_r = file->private_data;
-        loff_t pos = (file->f_flags & O_APPEND)
-                       ? inode->i_size
-                       : *off;
+        loff_t pos;
 
         TRACE ();
         BUG_ON (!sf_i);
@@ -136,11 +134,14 @@ sf_reg_write (struct file *file, const char *buf, size_t size, loff_t *off)
                 return -EINVAL;
         }
 
+        pos = *off;
+        if (file->f_flags & O_APPEND)
+                pos += inode->i_size;
+
         /** XXX Check write permission accoring to inode->i_mode! */
 
-        if (!size) {
+        if (!size)
                 return 0;
-        }
 
         tmp = kmalloc (CHUNK_SIZE, GFP_KERNEL);
         if (!tmp) {
diff --git a/src/VBox/Additions/solaris/Installer/makepackage.sh b/src/VBox/Additions/solaris/Installer/makepackage.sh
index 05f424b91..05f424b91 100644..100755
--- a/src/VBox/Additions/solaris/Installer/makepackage.sh
+++ b/src/VBox/Additions/solaris/Installer/makepackage.sh
diff --git a/src/VBox/Additions/solaris/Installer/postinstall.sh b/src/VBox/Additions/solaris/Installer/postinstall.sh
index 81fe3feb7..852042c7e 100644..100755
--- a/src/VBox/Additions/solaris/Installer/postinstall.sh
+++ b/src/VBox/Additions/solaris/Installer/postinstall.sh
@@ -19,13 +19,16 @@
 
 uncompress_files()
 {
+    # self-overwriting
     uncompress -f "$1/VBoxClient.Z" > /dev/null 2>&1
     uncompress -f "$1/VBoxService.Z" > /dev/null 2>&1
     uncompress -f "$1/VBoxControl.Z" > /dev/null 2>&1
     uncompress -f "$1/vboxvideo_drv_13.so.Z" > /dev/null 2>&1
     uncompress -f "$1/vboxvideo_drv_14.so.Z" > /dev/null 2>&1
+    uncompress -f "$1/vboxvideo_drv_15.so.Z" > /dev/null 2>&1
     uncompress -f "$1/vboxvideo_drv_71.so.Z" > /dev/null 2>&1
     uncompress -f "$1/vboxmouse_drv_14.so.Z" > /dev/null 2>&1
+    uncompress -f "$1/vboxmouse_drv_15.so.Z" > /dev/null 2>&1
     uncompress -f "$1/vboxmouse_drv_70.so.Z" > /dev/null 2>&1
     uncompress -f "$1/vboxmouse_drv_71.so.Z" > /dev/null 2>&1
 }
@@ -76,6 +79,10 @@ echo "Creating links..."
 # Install Xorg components to the required places
 xorgversion_long=`/usr/X11/bin/Xorg -version 2>&1 | grep "X Window System Version"`
 xorgversion=`/usr/bin/expr "${xorgversion_long}" : 'X Window System Version \([^ ]*\)'`
+if test -z "$xorgversion_long"; then
+    xorgversion_long=`/usr/X11/bin/Xorg -version 2>&1 | grep "X.Org X Server"`
+    xorgversion=`/usr/bin/expr "${xorgversion_long}" : 'X.Org X Server \([^ ]*\)'`
+fi
 
 vboxmouse_src=""
 vboxvideo_src=""
@@ -89,6 +96,10 @@ case "$xorgversion" in
         vboxmouse_src="vboxmouse_drv_14.so"
         vboxvideo_src="vboxvideo_drv_14.so"
         ;;
+    1.5.* )
+        vboxmouse_src="vboxmouse_drv_15.so"
+        vboxvideo_src="vboxvideo_drv_15.so"
+        ;;    
     7.1.* | *7.2.* )
         vboxmouse_src="vboxmouse_drv_71.so"
         vboxvideo_src="vboxvideo_drv_71.so"
diff --git a/src/VBox/Additions/solaris/Installer/preremove.sh b/src/VBox/Additions/solaris/Installer/preremove.sh
index b3d707849..b3d707849 100644..100755
--- a/src/VBox/Additions/solaris/Installer/preremove.sh
+++ b/src/VBox/Additions/solaris/Installer/preremove.sh
diff --git a/src/VBox/Additions/solaris/Makefile.kmk b/src/VBox/Additions/solaris/Makefile.kmk
index 34ca36c86..b805d4248 100644
--- a/src/VBox/Additions/solaris/Makefile.kmk
+++ b/src/VBox/Additions/solaris/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 15911 2009-01-13 12:04:29Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Makefile for the Solaris guest additions base directory.
 #
@@ -95,9 +95,11 @@ else
 	$(SOLARIS_ADD_BIN)/VBoxControl \
 	$(SOLARIS_ADD_BIN)/vboxvideo_drv_13.so \
 	$(SOLARIS_ADD_BIN)/vboxvideo_drv_14.so \
+	$(SOLARIS_ADD_BIN)/vboxvideo_drv_15.so \
 	$(SOLARIS_ADD_BIN)/vboxvideo_drv_70.so \
 	$(SOLARIS_ADD_BIN)/vboxvideo_drv_71.so \
 	$(SOLARIS_ADD_BIN)/vboxmouse_drv_14.so \
+	$(SOLARIS_ADD_BIN)/vboxmouse_drv_15.so \
 	$(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so \
 	$(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so
 endif
@@ -156,9 +158,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
 	$(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxControl                                     $(SOLARIS_ADD_INST_DIR_64)/VBoxControl
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_13.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_13.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_14.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_14.so
+	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_15.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_15.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_70.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_70.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_71.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_71.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_14.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_14.so
+	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_15.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_15.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_70.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_70.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_71.so                                       $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_71.so
 	$(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxguest                                          $(SOLARIS_ADD_INST_DIR_32)/vboxguest
@@ -167,9 +171,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
 	$(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxControl                                     $(SOLARIS_ADD_INST_DIR_32)/VBoxControl
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_13.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_13.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_14.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_14.so
+	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_15.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_15.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_70.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_70.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_71.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_71.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_14.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_14.so
+	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_15.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_15.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_70.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_70.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_71.so                                       $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_71.so
  ifdef VBOX_COMPRESS
@@ -179,9 +185,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/VBoxControl
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_13.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_14.so
+	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_15.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_70.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_71.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_14.so
+	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_15.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_70.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_71.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/VBoxClient
@@ -189,9 +197,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/VBoxControl
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_13.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_14.so
+	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_15.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_70.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_71.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_14.so
+	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_15.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_70.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_71.so
  endif # VBOX_COMPRESS
@@ -202,9 +212,11 @@ else  # !VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
 	$(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxControl                                        $(SOLARIS_ADD_INST_DIR_ISA)/VBoxControl
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_13.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_13.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_14.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_14.so
+	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_15.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_15.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_70.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_70.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_71.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_71.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_14.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_14.so
+	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_15.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_15.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_70.so
 	$(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so                                          $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_71.so
  ifdef VBOX_COMPRESS
@@ -214,9 +226,11 @@ else  # !VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/VBoxControl
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_13.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_14.so
+	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_15.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_70.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_71.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_14.so
+	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_15.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_70.so
 	$(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_71.so
  endif # VBOX_COMPRESS
diff --git a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
index 3b53f4dff..134b2baf2 100644
--- a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
+++ b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the Solaris Shared folder kernel module.
 #
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h
index 8119bb04a..6a0ed533b 100644
--- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs.h 11982 2008-09-02 13:09:44Z vboxsync $ */
+/* $Id: vboxvfs.h $ */
 /** @file
  * VirtualBox File System Driver for Solaris Guests, Internal Header.
  */
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c
index f6dbd1d63..a6568ae1b 100644
--- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs_mount.c 10456 2008-07-10 07:04:39Z vboxsync $ */
+/* $Id: vboxvfs_mount.c $ */
 /** @file
  * VirtualBox File System Mount Helper, Solaris host.
  * Userspace mount wrapper that parses mount (or user-specified) options
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c
index 52d4b7c4c..4ef489802 100644
--- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs_utils.c 13837 2008-11-05 02:54:02Z vboxsync $ */
+/* $Id: vboxvfs_utils.c $ */
 /** @file
  * VirtualBox File System Driver for Solaris Guests, Utility functions.
  */
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c
index 688211a15..986b407f5 100644
--- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs_vfsops.c 13835 2008-11-05 02:34:43Z vboxsync $ */
+/* $Id: vboxvfs_vfsops.c $ */
 /** @file
  * VirtualBox File System Driver for Solaris Guests. VFS operations.
  */
diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c
index 1b7a6bc0c..b7b26e04b 100644
--- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c
+++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c
@@ -1,4 +1,4 @@
-/* $Id: vboxvfs_vnops.c 11982 2008-09-02 13:09:44Z vboxsync $ */
+/* $Id: vboxvfs_vnops.c $ */
 /** @file
  * VirtualBox File System Driver for Solaris Guests, VNode Operations.
  */
diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
index 88850e108..066c01357 100644
--- a/src/VBox/Additions/x11/Makefile.kmk
+++ b/src/VBox/Additions/x11/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the X11 Guest Additions.
 #
diff --git a/src/VBox/Additions/x11/installer/98vboxadd-xclient b/src/VBox/Additions/x11/installer/98vboxadd-xclient
index f0c0b1f2c..f0c0b1f2c 100644..100755
--- a/src/VBox/Additions/x11/installer/98vboxadd-xclient
+++ b/src/VBox/Additions/x11/installer/98vboxadd-xclient
diff --git a/src/VBox/Additions/x11/installer/VBoxRandR.sh b/src/VBox/Additions/x11/installer/VBoxRandR.sh
index 98fad199d..0e1e6b81d 100755
--- a/src/VBox/Additions/x11/installer/VBoxRandR.sh
+++ b/src/VBox/Additions/x11/installer/VBoxRandR.sh
@@ -61,21 +61,44 @@ fi
 
 # If we were called with the --test parameter, we check whether the display
 # we are running on is really using the VBox video driver (and RandR 1.2),
-# and whether we are running on a buggy version of X.org which might crash
+# and whether we are running on a buggy version of X.Org which might crash
 # when we resize.
 if test "$1" = "--test"; then
+    # Check for buggy X.Org versions
     xout=`$xorgbin -version 2>&1`
-    if echo "$xout" | grep 1.4.99.901 > /dev/null; then
-        exit 1
-    elif echo "$xout" | grep 1.4.99.902 > /dev/null; then
-        exit 1
-    elif echo "$xout" | grep 1.4.99.903 > /dev/null; then
-        exit 1
-    elif echo "$xout" | grep 1.4.99.904 > /dev/null; then
-        exit 1
-    elif echo "$xout" | grep 1.4.99.905 > /dev/null; then
+    if echo "$xout" | grep "1\.4\.99\.90[12345]" > /dev/null
+    then
+        echo "Warning: the version of the X Window system on your guest has a known"
+        echo "problem. Because of this, dynamic resizing and seamless mode will not work."
+        echo
         exit 1
     fi
+    # Check to see if the server is configured to use static modes only.
+    for conf in "/etc/X11/xorg.conf-4" "/etc/X11/xorg.conf" "/etc/X11/.xorg.conf" "/etc/xorg.conf" \
+                "/usr/etc/X11/xorg.conf-4" "/usr/etc/X11/xorg.conf" "/usr/lib/X11/xorg.conf-4" \
+                "/usr/lib/X11/xorg.conf"
+    do
+        if [ -r $conf ]
+        then
+            if awk -v IN_SECTION=0 \
+'tolower($0) ~ /^[ \t]*section/ { IN_SECTION=1 } '\
+'tolower($0) ~ /^[ \t]*modes/ { if (IN_SECTION) { print "mode"; exit } } '\
+'tolower($0) ~ /^[ \t]*option[ \t]+\"preferredmode\"/ { if (IN_SECTION) { print "mode"; exit } } '\
+'tolower($0) ~ /endsection/ { IN_SECTION=0 }' \
+                $conf 2>/dev/null | grep mode > /dev/null
+            then
+                echo "Disabling dynamic resizing as the X server is configured to only use static"
+                echo "resolutions.  To fix this, edit the server configuration file, remove all"
+                echo "\"Modes\" lines from the \"Screen\" section and any Option \"PreferredMode\""
+                echo "lines from \"Monitor\" sections and restart the server."
+                echo
+                exit 1
+            fi
+        fi
+    done
+    # Don't write out error information in this case, as this script is also
+    # called from the installer, and vboxvideo will not yet be in place yet in
+    # that case.
     $randrbin 2> /dev/null | grep VBOX1 > /dev/null
     exit
 fi
@@ -84,3 +107,4 @@ fi
 # which is the one corresponding to the last video mode hint sent by the host.
 $randrbin --output VBOX1 --preferred
 $refreshbin 2>&1 > /dev/null
+
diff --git a/src/VBox/Additions/x11/installer/x11config.pl b/src/VBox/Additions/x11/installer/x11config.pl
index 69c385b31..69c385b31 100644..100755
--- a/src/VBox/Additions/x11/installer/x11config.pl
+++ b/src/VBox/Additions/x11/installer/x11config.pl
diff --git a/src/VBox/Additions/x11/installer/x11config15.pl b/src/VBox/Additions/x11/installer/x11config15.pl
index d23c35221..d23c35221 100644..100755
--- a/src/VBox/Additions/x11/installer/x11config15.pl
+++ b/src/VBox/Additions/x11/installer/x11config15.pl
diff --git a/src/VBox/Additions/x11/installer/x11config15suse.pl b/src/VBox/Additions/x11/installer/x11config15suse.pl
new file mode 100755
index 000000000..419a6698a
--- /dev/null
+++ b/src/VBox/Additions/x11/installer/x11config15suse.pl
@@ -0,0 +1,159 @@
+#!/usr/bin/perl -w
+#
+# Sun xVM VirtualBox
+#
+# Guest Additions X11 config update script
+#
+# Copyright (C) 2006-2008 Sun Microsystems, Inc.
+#
+# This file is part of VirtualBox Open Source Edition (OSE), as
+# available from http://www.virtualbox.org. This file is free software;
+# you can redistribute it and/or modify it under the terms of the GNU
+# General Public License (GPL) as published by the Free Software
+# Foundation, in version 2 as it comes in the "COPYING" file of the
+# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
+# Clara, CA 95054 USA or visit http://www.sun.com if you need
+# additional information or have any questions.
+#
+
+# Versions of (open)SUSE which ship X.Org Server 1.5 still do not enable
+# mouse autodetection, so on these systems we have to enable vboxmouse in the
+# X.Org configuration file as well as vboxvideo.  When uninstalling, we enable
+# the fbdev driver, which SUSE prefers over vesa, and we leave the references
+# to vboxmouse in place, as without the driver they are harmless.
+
+use File::Copy;
+
+# This is the file name for the temporary file we write the new configuration
+# to.
+# @todo: perl must have an API for generating this
+my $temp="/tmp/xorg.conf";
+# The list of possible names of X.org configuration files
+my @cfg_files = ("/etc/X11/xorg.conf-4", "/etc/X11/xorg.conf", "/etc/X11/.xorg.conf", "/etc/xorg.conf",
+                 "/usr/etc/X11/xorg.conf-4", "/usr/etc/X11/xorg.conf", "/usr/lib/X11/xorg.conf-4",
+                 "/usr/lib/X11/xorg.conf");
+# File descriptor of the old configuration file
+my $CFG;
+# File descriptor of the temporary file
+my $TMP;
+
+# The name of the mouse driver we are enabling
+my $mousedrv = 'vboxmouse';
+# The name of the video driver we are enabling
+my $videodrv=  'vboxvideo';
+
+# If we are uninstalling, restore the old video driver
+if (@ARGV && "$ARGV[0]" eq 'uninstall')
+{
+    $videodrv = 'fbdev'  # SUSE prefers this one
+}
+
+# How many different configuration files have we found?
+my $config_count = 0;
+
+# Subroutine to roll back after a partial installation
+sub do_fail {
+    foreach $cfg (@cfg_files) {
+        move "$cfg.vbox", $cfg;
+        unlink "$cfg.vbox";
+    }
+    die $_[0];
+}
+
+# Perform the substitution on any configuration file we may find.
+foreach $cfg (@cfg_files) {
+
+    if (open(CFG, $cfg)) {
+        open(TMP, ">$temp")
+            or &do_fail("Can't create $TMP: $!\n");
+
+        my $have_mouse = 0;
+        my $in_section = 0;
+        my $in_layout = 0;
+
+        # Go through the configuration file line by line
+        while (defined ($line = <CFG>)) {
+            # Look for the start of sections
+            if ($line =~ /^\s*Section\s*"([a-zA-Z]+)"/i) {
+                my $section = lc($1);
+                # And see if they are device or input device sections
+                if (($section eq "inputdevice") || $section eq "device") {
+                    $in_section = 1;
+                }
+                # Or server layout sections
+                if ($section eq "serverlayout")
+                {
+                    $in_section = 1;
+                    $in_layout = 1;
+                }
+            } else {
+                if ($line =~ /^\s*EndSection/i && $in_layout) {
+                    # We always add this to the end of the server layout.
+                    print TMP "  InputDevice  \"VBoxMouse\"\n"
+                }
+                if ($line =~ /^\s*EndSection/i) {
+                    $in_section = 0;
+                    $in_layout = 0;
+                }
+            }
+
+            if ($in_section) {
+                # Inside sections, look for any graphics drivers and replace
+                # them with our one.
+                if ($line =~ /^\s*driver\s+\"(fbdev|vga|vesa|vboxvideo|ChangeMe)\"/i) {
+                    $line =~ s/(fbdev|vga|vesa|vboxvideo|ChangeMe)/$videodrv/i;
+                }
+                # Also keep track of whether this configuration file contains
+                # an input device section for vboxmouse.  If it does, we don't
+                # need to add one later.
+                if ($line =~ /^\s*driver\s+\"(?:vboxmouse)\"/i)
+                {
+                    $have_mouse = 1
+                }
+
+                # We add vboxmouse to the server layout section ourselves, so
+                # remove any existing references to it.
+                if (   $line =~ /^\s*inputdevice.*\"vboxmouse\"/i)
+                {
+                    $line = "";
+                }
+            }
+            print TMP $line;
+        }
+
+        # We always add a vboxmouse section at the end for SUSE guests using
+        # X.Org 1.5 if vboxmouse is not referenced anywhere else in the file,
+        # and we do not remove it when we uninstall the additions, as it will
+        # not do any harm if it is left.
+        if (!$have_mouse) {
+            print TMP "\n";
+            print TMP "Section \"InputDevice\"\n";
+            print TMP "        Identifier  \"VBoxMouse\"\n";
+            print TMP "        Driver      \"$mousedrv\"\n";
+            print TMP "        Option      \"Device\"     \"\/dev\/vboxadd\"\n";
+            print TMP "        Option      \"SendCoreEvents\"  \"on\"\n";
+            print TMP "EndSection\n";
+        }
+        close(TMP);
+
+        # We do not overwrite existing "$cfg.vbox" files in order to keep a
+        # record of what the configuration looked like before the very first
+        # installation of the additions.
+        copy $cfg, "$cfg.bak";
+        if (! -e "$cfg.vbox") {
+            rename $cfg, "$cfg.vbox";
+        }
+        copy $temp, $cfg
+            or &do_fail("Could not overwrite configuration file $cfg!  Exiting...");
+        unlink $temp;
+
+        $config_count++;
+    }
+}
+
+# Warn if we did not find any configuration files
+$config_count != 0 or die "Could not find any X11 configuration files";
+
diff --git a/src/VBox/Additions/x11/installer/x11restore.pl b/src/VBox/Additions/x11/installer/x11restore.pl
index 811e78de0..8e17e1862 100644..100755
--- a/src/VBox/Additions/x11/installer/x11restore.pl
+++ b/src/VBox/Additions/x11/installer/x11restore.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Revision: 8178 $
+# $Revision: 29890 $
 #
 # Sun xVM VirtualBox
 #
diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h b/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h
index 22f7eeaa7..1b0d60206 100644
--- a/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h
+++ b/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h
@@ -1,6 +1,6 @@
 /* include/X11/XlibConf.h.  Generated by configure.  */
 /*
- * $Id: XlibConf.h.in,v 1.1 2005/07/08 06:57:07 keithp Exp $
+ * $Id: XlibConf.h.in $
  *
  * Copyright © 2005 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h
index bfdfbee97..e449b2ed8 100644
--- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h
+++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h
@@ -1,5 +1,5 @@
 /*
- * $Id: composite.h,v 1.2 2004/07/31 06:16:50 anholt Exp $
+ * $Id: composite.h $
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h
index 2304e961d..5f9cffef4 100644
--- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h
+++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h
@@ -1,5 +1,5 @@
 /*
- * $Id: compositeproto.h,v 1.2 2004/07/31 06:16:50 anholt Exp $
+ * $Id: compositeproto.h $
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h
index b190d68c7..833a584f2 100644
--- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h
+++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h
@@ -1,5 +1,5 @@
 /*
- * $Id: damageproto.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $
+ * $Id: damageproto.h $
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h
index d523cea98..dc7221ffb 100644
--- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h
+++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h
@@ -1,5 +1,5 @@
 /*
- * $Id: damagewire.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $
+ * $Id: damagewire.h $
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h b/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h
index 4775793ab..84e5e190b 100644
--- a/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h
+++ b/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h
@@ -1,5 +1,5 @@
 /*
- * $Id: picturestr.h,v 1.15 2005/12/09 18:35:21 ajax Exp $
+ * $Id: picturestr.h $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h b/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h
index bfd19fa93..00013b7af 100644
--- a/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h
+++ b/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h
@@ -1,5 +1,5 @@
 /*
- * $Id: renderedge.h,v 1.4 2005/08/24 11:18:33 daniels Exp $
+ * $Id: renderedge.h $
  *
  * Copyright © 2004 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h b/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h
index 43925f42f..e555855a3 100644
--- a/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h
+++ b/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h
@@ -1,5 +1,5 @@
 /*************************************************************************************
- * $Id: uda1380.h,v 1.3 2005/09/24 21:56:00 bogdand Exp $
+ * $Id: uda1380.h $
  * 
  * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net
  *
diff --git a/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h b/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h
index cfc2b5f07..9b6105032 100644
--- a/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h
+++ b/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h
@@ -1,5 +1,5 @@
 /*
- * $Id: damage.h,v 1.3 2005/07/01 22:43:41 daniels Exp $
+ * $Id: damage.h $
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h b/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h
index ce11af10c..ed6068bc7 100644
--- a/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h
+++ b/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h
@@ -1,5 +1,5 @@
 /*
- * $Id: damagestr.h,v 1.6 2005/07/03 07:02:01 daniels Exp $
+ * $Id: damagestr.h $
  *
  * Copyright © 2003 Keith Packard
  *
diff --git a/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h b/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h
index b9ee6f14d..14d334b54 100644
--- a/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h
+++ b/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h
@@ -1,5 +1,5 @@
 /*
- * $Id: picturestr.h,v 1.14 2005/08/24 11:18:33 daniels Exp $
+ * $Id: picturestr.h $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/src/VBox/Additions/x11/xclient/Makefile.kmk b/src/VBox/Additions/x11/xclient/Makefile.kmk
index 5edd3e0a9..cad3e04bd 100644
--- a/src/VBox/Additions/x11/xclient/Makefile.kmk
+++ b/src/VBox/Additions/x11/xclient/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 16014 2009-01-18 00:04:12Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the VirtualBox Guest Addition X11 Client.
 #
diff --git a/src/VBox/Additions/x11/xclient/clipboard.cpp b/src/VBox/Additions/x11/xclient/clipboard.cpp
index 45fa1087c..7611f9ee9 100644
--- a/src/VBox/Additions/x11/xclient/clipboard.cpp
+++ b/src/VBox/Additions/x11/xclient/clipboard.cpp
@@ -1,4 +1,4 @@
-/** $Id: clipboard.cpp 14297 2008-11-18 12:40:43Z vboxsync $ */
+/** $Id: clipboard.cpp $ */
 /** @file
  * Guest Additions - X11 Shared Clipboard.
  */
diff --git a/src/VBox/Additions/x11/xgraphics/Makefile.kmk b/src/VBox/Additions/x11/xgraphics/Makefile.kmk
index 0c05a9c9d..5cf142e25 100644
--- a/src/VBox/Additions/x11/xgraphics/Makefile.kmk
+++ b/src/VBox/Additions/x11/xgraphics/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 16091 2009-01-20 16:53:58Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the VBox Linux Additions X.org graphics driver.
 #
diff --git a/src/VBox/Additions/x11/xgraphics/vboxutils.c b/src/VBox/Additions/x11/xgraphics/vboxutils.c
index d478bb158..c02809b29 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxutils.c
+++ b/src/VBox/Additions/x11/xgraphics/vboxutils.c
@@ -252,8 +252,8 @@ vboxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects)
 
     for (i = 0; i < iRects; i++)
     {
-        cmdHdr.x = (int16_t)aRects[i].x1;
-        cmdHdr.y = (int16_t)aRects[i].y1;
+        cmdHdr.x = (int16_t)aRects[i].x1 - pVBox->viewportX;
+        cmdHdr.y = (int16_t)aRects[i].y1 - pVBox->viewportY;
         cmdHdr.w = (uint16_t)(aRects[i].x2 - aRects[i].x1);
         cmdHdr.h = (uint16_t)(aRects[i].y2 - aRects[i].y1);
 
diff --git a/src/VBox/Additions/x11/xgraphics/vboxutils_68.c b/src/VBox/Additions/x11/xgraphics/vboxutils_68.c
index f47b4047e..668612d94 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxutils_68.c
+++ b/src/VBox/Additions/x11/xgraphics/vboxutils_68.c
@@ -232,8 +232,8 @@ vboxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects)
 
     for (i = 0; i < iRects; i++)
     {
-        cmdHdr.x = (int16_t)aRects[i].x1;
-        cmdHdr.y = (int16_t)aRects[i].y1;
+        cmdHdr.x = (int16_t)aRects[i].x1 - pVBox->viewportX;
+        cmdHdr.y = (int16_t)aRects[i].y1 - pVBox->viewportY;
         cmdHdr.w = (uint16_t)(aRects[i].x2 - aRects[i].x1);
         cmdHdr.h = (uint16_t)(aRects[i].y2 - aRects[i].y1);
 
diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo.h b/src/VBox/Additions/x11/xgraphics/vboxvideo.h
index 355de8304..4f72f5f9c 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxvideo.h
+++ b/src/VBox/Additions/x11/xgraphics/vboxvideo.h
@@ -156,6 +156,7 @@ typedef struct _VBOXRec
      * safe to touch the hardware. */
     Bool vtSwitch;
     Bool useVbva;
+    int viewportX, viewportY;
     VMMDevMemory *pVMMDevMemory;
     VBVAMEMORY *pVbvaMemory;
 } VBOXRec, *VBOXPtr;
diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c
index b7a2c57b9..12474232d 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c
+++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c
@@ -1215,12 +1215,21 @@ static void
 VBOXAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]);
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
     TRACE;
     /* Don't fiddle with the hardware if we are switched
      * to a virtual terminal. */
-    if (!pVBox->vtSwitch)
+    if (!pVBox->vtSwitch) {
+        pVBox->viewportX = x;
+        pVBox->viewportY = y;
+        /* If VBVA is enabled the graphics card will not notice the change. */
+        if (pVBox->useVbva == TRUE)
+            vboxDisableVbva(pScrn);
         VBESetDisplayStart(pVBox->pVbe, x, y, TRUE);
+        if (pVBox->useVbva == TRUE)
+            vboxEnableVbva(pScrn);
+    }
     TRACE2;
 }
 
diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c
index 0ed9a413b..facbc0d61 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c
+++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c
@@ -1282,12 +1282,21 @@ static void
 VBOXAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]);
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
     TRACE;
     /* Don't fiddle with the hardware if we are switched
      * to a virtual terminal. */
-    if (!pVBox->vtSwitch)
+    if (!pVBox->vtSwitch) {
+        pVBox->viewportX = x;
+        pVBox->viewportY = y;
+        /* If VBVA is enabled the graphics card will not notice the change. */
+        if (pVBox->useVbva == TRUE)
+            vboxDisableVbva(pScrn);
         VBESetDisplayStart(pVBox->pVbe, x, y, TRUE);
+        if (pVBox->useVbva == TRUE)
+            vboxEnableVbva(pScrn);
+    }
     TRACE2;
 }
 
diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c
index 73c6a7b8a..e5376235c 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c
+++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c
@@ -830,8 +830,16 @@ static void
 VBOXAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]);
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
+    pVBox->viewportX = x;
+    pVBox->viewportY = y;
+    /* If VBVA is enabled the graphics card will not notice the change. */
+    if (pVBox->useVbva == TRUE)
+        vboxDisableVbva(pScrn);
     VBESetDisplayStart(pVBox->pVbe, x, y, TRUE);
+    if (pVBox->useVbva == TRUE)
+        vboxEnableVbva(pScrn);
 }
 
 static void
diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h
index ee39edd09..77998dc25 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h
+++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h
@@ -152,6 +152,7 @@ typedef struct _VBOXRec
     size_t pointerSize;
     Bool pointerOffscreen;
     Bool useVbva;
+    int viewportX, viewportY;
     VMMDevVideoAccelFlush *reqf; 
     VMMDevVideoAccelEnable *reqe; 
     VMMDevMemory *pVMMDevMemory;
diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c
index 90aeec489..047826faf 100644
--- a/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c
+++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c
@@ -51,7 +51,34 @@
  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  */
 
-#define DEBUG_VERB 2
+#ifdef DEBUG_michael
+# define DEBUG_VIDEO 1
+#endif
+#ifdef DEBUG_VIDEO
+
+#define TRACE \
+do { \
+    xf86Msg(X_INFO, __PRETTY_FUNCTION__); \
+    xf86Msg(X_INFO, ": entering\n"); \
+} while(0)
+#define TRACE2 \
+do { \
+    xf86Msg(X_INFO, __PRETTY_FUNCTION__); \
+    xf86Msg(X_INFO, ": leaving\n"); \
+} while(0)
+#define TRACE3(...) \
+do { \
+    xf86Msg(X_INFO, __PRETTY_FUNCTION__); \
+    xf86Msg(X_INFO, __VA_ARGS__); \
+} while(0)
+
+#else  /* DEBUG_VIDEO not defined */
+
+#define TRACE       do { } while(0)
+#define TRACE2      do { } while(0)
+#define TRACE3(...) do { } while(0)
+
+#endif  /* DEBUG_VIDEO not defined */
 
 #ifdef XFree86LOADER
 # include "xorg-server.h"
@@ -885,8 +912,16 @@ static void
 VBOXAdjustFrame(int scrnIndex, int x, int y, int flags)
 {
     VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]);
+    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
 
+    pVBox->viewportX = x;
+    pVBox->viewportY = y;
+    /* If VBVA is enabled the graphics card will not notice the change. */
+    if (pVBox->useVbva == TRUE)
+        vboxDisableVbva(pScrn);
     VBESetDisplayStart(pVBox->pVbe, x, y, TRUE);
+    if (pVBox->useVbva == TRUE)
+        vboxEnableVbva(pScrn);
 }
 
 static void
diff --git a/src/VBox/Additions/x11/xmouse/Makefile.kmk b/src/VBox/Additions/x11/xmouse/Makefile.kmk
index 8816908a1..e3ecccc39 100644
--- a/src/VBox/Additions/x11/xmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/xmouse/Makefile.kmk
@@ -1,4 +1,4 @@
-# $Id: Makefile.kmk 16091 2009-01-20 16:53:58Z vboxsync $
+# $Id: Makefile.kmk $
 ## @file
 # Sub-Makefile for the VBox Additions XFree86 and X.org mouse drivers.
 #