[gle/f15: 4/4] Merge branch 'master' into f15

[terjeros]

commit 01c8df1aef32e352baceae0a8de92272edf7c69d
Merge: ae52025 c35c9f1
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Sat Jan 21 22:19:55 2012 +0100

    Merge branch 'master' into f15

 .gitignore                 |    1 +
 gle-4.2.2-64bit.patch      |   34 -------------
 gle-4.2.4-include.patch    |   26 ----------
 gle-4.2.4b-configure.patch |   31 ++++++++++++
 gle-4.2.4b-gcc-4.7.patch   |  117 ++++++++++++++++++++++++++++++++++++++++++++
 gle.spec                   |   51 +++++++++++++------
 sources                    |    3 +-
 7 files changed, 185 insertions(+), 78 deletions(-)
---