[eurephia/f18: 2/2] Merge branch 'master' into f18

[dsommers]

commit 257b1a0adcf0bcebe921a69656e728cb26e47b34
Merge: e5b66fd e13bfe5
Author: David Sommerseth <davids at redhat.com>
Date:   Fri Oct 19 19:05:57 2012 +0200

    Merge branch 'master' into f18

 .gitignore    |    1 +
 eurephia.spec |   11 ++++++++---
 sources       |    3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --cc sources
index 2360ff6,6524a56..8bd21ee
--- a/sources
+++ b/sources
@@@ -1,3 -1,3 +1,4 @@@
- b4c329cbac5fd38dc8f4f3f13c36bf11  eurephia-1.0.1.tar.bz2
+ 8d90df6a238050baf4b7481f429523ea  eurephia-1.1.0_buildfix.patch
+ efd014325f0c4f28b5d9b2c7db24671b  eurephia-1.1.0_upstreamfixes.patch
  b902119628931a45c7a84ed3d1bb1513  eurephia-1.1.0.tar.bz2
 +8d90df6a238050baf4b7481f429523ea  eurephia-1.1.0_buildfix.patch