Merge remote-tracking branch 'origin/released'

* origin/released:
  libxcb xserver pixman mesa git update 20 sep 2012

Conflicts:
	libxcb/src/xcb_conn.c

1 files changed, 40 insertions, 41 deletions

diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html
index 6fc7c584a..94b538da1 100644
--- a/mesalib/docs/contents.html
+++ b/mesalib/docs/contents.html
@@ -25,60 +25,59 @@
 
 <b>Documentation</b>
 <ul>
-<li><a href="intro.html" target="MainFrame">Introduction</a>
-<li><a href="news.html" target="MainFrame">News</a>
-<li><a href="developers.html" target="MainFrame">Developers</a>
-<li><a href="systems.html" target="MainFrame">Platforms and Drivers</a>
-<li><a href="license.html" target="MainFrame">License &amp; Copyright</a>
-<li><a href="faq.html" target="MainFrame">FAQ</a>
-<li><a href="relnotes.html" target="MainFrame">Release Notes</a>
-<li><a href="thanks.html" target="MainFrame">Acknowledgements</a>
-<li><a href="conform.html" target="MainFrame">Conformance Testing</a>
+<li><a href="intro.html" target="_parent">Introduction</a>
+<li><a href="index.html" target="_parent">News</a>
+<li><a href="developers.html" target="_parent">Developers</a>
+<li><a href="systems.html" target="_parent">Platforms and Drivers</a>
+<li><a href="license.html" target="_parent">License &amp; Copyright</a>
+<li><a href="faq.html" target="_parent">FAQ</a>
+<li><a href="relnotes.html" target="_parent">Release Notes</a>
+<li><a href="thanks.html" target="_parent">Acknowledgements</a>
+<li><a href="conform.html" target="_parent">Conformance Testing</a>
 <li>more docs below...
 </ul>
 
 <b>Download / Install</b>
 <ul>
-<li><a href="download.html" target="MainFrame">Downloading / Unpacking</a>
-<li><a href="install.html" target="MainFrame">Compiling / Installing</a>
-<li><a href="precompiled.html" target="MainFrame">Precompiled Libraries</a>
+<li><a href="download.html" target="_parent">Downloading / Unpacking</a>
+<li><a href="install.html" target="_parent">Compiling / Installing</a>
+<li><a href="precompiled.html" target="_parent">Precompiled Libraries</a>
 </ul>
 
 <b>Resources</b>
 <ul>
-<li><a href="lists.html" target="MainFrame">Mailing Lists</a>
-<li><a href="bugs.html" target="MainFrame">Bug Database</a>
-<li><a href="webmaster.html" target="MainFrame">Webmaster</a>
+<li><a href="lists.html" target="_parent">Mailing Lists</a>
+<li><a href="bugs.html" target="_parent">Bug Database</a>
+<li><a href="webmaster.html" target="_parent">Webmaster</a>
 <li><a href="http://dri.freedesktop.org/" target="_parent">Mesa/DRI Wiki</a>
 </ul>
 
 <b>User Topics</b>
 <ul>
-<li><a href="egl.html" target="MainFrame">EGL</a>
-<li><a href="opengles.html" target="MainFrame">OpenGL ES</a>
-<li><a href="openvg.html" target="MainFrame">OpenVG / Vega</a>
-<li><a href="envvars.html" target="MainFrame">Environment Variables</a>
-<li><a href="osmesa.html" target="MainFrame">Off-Screen Rendering</a>
-<li><a href="debugging.html" target="MainFrame">Debugging Tips</a>
-<li><a href="perf.html" target="MainFrame">Performance Tips</a>
-<li><a href="extensions.html" target="MainFrame">Mesa Extensions</a>
-<li><a href="mangling.html" target="MainFrame">Function Name Mangling</a>
-<li><a href="llvmpipe.html" target="MainFrame">Gallium llvmpipe driver</a>
-<li><a href="vmware-guest.html" target="MainFrame">VMware SVGA3D guest driver</a>
-<li><a href="postprocess.html" target="MainFrame">Gallium post-processing</a>
-<li><a href="viewperf.html" target="MainFrame">Viewperf Issues</a>
+<li><a href="egl.html" target="_parent">EGL</a>
+<li><a href="opengles.html" target="_parent">OpenGL ES</a>
+<li><a href="openvg.html" target="_parent">OpenVG / Vega</a>
+<li><a href="envvars.html" target="_parent">Environment Variables</a>
+<li><a href="osmesa.html" target="_parent">Off-Screen Rendering</a>
+<li><a href="debugging.html" target="_parent">Debugging Tips</a>
+<li><a href="perf.html" target="_parent">Performance Tips</a>
+<li><a href="extensions.html" target="_parent">Mesa Extensions</a>
+<li><a href="mangling.html" target="_parent">Function Name Mangling</a>
+<li><a href="llvmpipe.html" target="_parent">Gallium llvmpipe driver</a>
+<li><a href="vmware-guest.html" target="_parent">VMware SVGA3D guest driver</a>
+<li><a href="postprocess.html" target="_parent">Gallium post-processing</a>
+<li><a href="viewperf.html" target="_parent">Viewperf Issues</a>
 </ul>
 
 <b>Developer Topics</b>
 <ul>
-<li><a href="http://sourceforge.net/projects/mesa3d" target="_parent">SourceForge homepage</a>
-<li><a href="repository.html" target="MainFrame">Source Code Repository</a>
-<li><a href="sourcetree.html" target="MainFrame">Source Code Tree</a>
-<li><a href="utilities.html" target="MainFrame">Utilities</a>
-<li><a href="helpwanted.html" target="MainFrame">Help Wanted</a>
-<li><a href="devinfo.html" target="MainFrame">Development Notes</a>
-<li><a href="sourcedocs.html" target="MainFrame">Source Documentation</a>
-<li><a HREF="dispatch.html" target="MainFrame">GL Dispatch</a>
+<li><a href="repository.html" target="_parent">Source Code Repository</a>
+<li><a href="sourcetree.html" target="_parent">Source Code Tree</a>
+<li><a href="utilities.html" target="_parent">Utilities</a>
+<li><a href="helpwanted.html" target="_parent">Help Wanted</a>
+<li><a href="devinfo.html" target="_parent">Development Notes</a>
+<li><a href="sourcedocs.html" target="_parent">Source Documentation</a>
+<li><a href="dispatch.html" target="_parent">GL Dispatch</a>
 </ul>
 
 <b>Links</b>
@@ -86,11 +85,11 @@
 <li><a href="http://www.opengl.org" target="_parent">OpenGL website</a>
 <li><a href="http://dri.freedesktop.org" target="_parent">DRI website</a>
 <li><a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>
-<li><a href="games.html" target="MainFrame">Games and Entertainment</a>
-<li><a href="libraries.html" target="MainFrame">Libraries and Toolkits</a>
-<li><a href="modelers.html" target="MainFrame">Modeling and Rendering</a>
-<li><a href="science.html" target="MainFrame">Science and Technical</a>
-<li><a href="utility.html" target="MainFrame">Utilities</a>
+<li><a href="games.html" target="_parent">Games and Entertainment</a>
+<li><a href="libraries.html" target="_parent">Libraries and Toolkits</a>
+<li><a href="modelers.html" target="_parent">Modeling and Rendering</a>
+<li><a href="science.html" target="_parent">Science and Technical</a>
+<li><a href="utility.html" target="_parent">Utilities</a>
 </ul>
 
 <b>Hosted by:</b>