xserver: Branch 'master' - 2 commits

[Keith Packard]

Rebased ref, commits from common ancestor:
commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 1 01:01:58 2013 -0700

    Set version to 1.14.99.901 (1.15 RC1)
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index 3d9832b..0d855f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.14.99.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2013-10-18"
-RELEASE_NAME="Bundaberg"
+AC_INIT([xorg-server], 1.14.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2013-10-31"
+RELEASE_NAME="Bom Retiro"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
commit 9db1d66f6d2c6857de220d8f1c08965962fe1416
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Nov 1 01:43:59 2013 -0700

    Add dri3 and present directorys to distribution
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/Makefile.am b/Makefile.am
index 28266c5..5bf760b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,8 @@ DIST_SUBDIRS = \
 	glx \
 	exa \
 	config \
+	dri3 \
+	present \
 	hw \
 	test