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

[terjeros]

commit a4b607ea13cff20b5e80106c23a67edfb5e6f063
Merge: 01c8df1 0f0aec4
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Mar 22 20:15:48 2012 +0100

    Merge branch 'master' into f15

 .gitignore                 |    1 +
 gle-4.2.4b-configure.patch |   31 ------------
 gle-4.2.4b-gcc-4.7.patch   |  117 --------------------------------------------
 gle.spec                   |   15 +++---
 sources                    |    2 +-
 5 files changed, 10 insertions(+), 156 deletions(-)
---