[sphinx/f18: 6/6] Merge branch 'master' into f18

[Christof Damian]

commit 16bf7680366f36ea3005e7834d2319caedcf1822
Merge: 7a0967b c1b3ef6
Author: Christof Damian <christof at damian.net>
Date:   Sun Apr 21 00:12:43 2013 +0200

    Merge branch 'master' into f18

 .gitignore                        |    4 +-
 sources                           |    2 +-
 sphinx-0.9.9-default_listen.patch |   26 -
 sphinx-0.9.9-fix_static.patch     |   12 -
 sphinx-aarch64.patch              | 2682 +++++++++++++++++++++++++++++++++++++
 sphinx.spec                       |  111 +-
 6 files changed, 2738 insertions(+), 99 deletions(-)
---