xserver: Branch 'master'

[Adam Jackson]

 doc/c-extensions |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b8fca667b45f00249a3dd9ee79d2a77a4177b24
Author: Cyril Brulebois <kibi at debian.org>
Date:   Mon Jun 6 02:24:59 2011 +0200

    doc: Fix typo.
    
    Signed-off-by: Cyril Brulebois <kibi at debian.org>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

diff --git a/doc/c-extensions b/doc/c-extensions
index 4a90061..e5fde34 100644
--- a/doc/c-extensions
+++ b/doc/c-extensions
@@ -21,7 +21,7 @@ extensions, although the results may not be optimal.
                  table.
     * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function
                    is never called from another module.
-    * _X_INLINE: inline this functon if possible (generally obeyed unless
+    * _X_INLINE: inline this function if possible (generally obeyed unless
                  disabling optimisations).
     * _X_DEPRECATED: warn on use of this function.