[ Timo Aaltonen ]
* Merge from unreleased debian git.
* Dropped upstream patches:
  - 229_udev-fix.diff
  - 231-scan-pci-after-probing-devices.patch
  - 235-composite-tracking.patch
  - 237-dix-set-the-device-transformation-matrix.patch

[ Maarten Lankhorst ]
* Dropped upstream patches:
  - 230-fix-compat-output-selection.patch
* Merge 1.13.1.rc2 from unreleased debian git.
* Bump ABI_VIDEODRV_VERSION to 13.1
  - xf86UpdateDesktopDimensions is newly exported for nvidia blob