[vdr-epgsearch/f13/master: 4/4] Merge remote branch 'origin/master' into f13

[Ville Skyttä]

commit 485e49378e5f952398ca70f454560a60625bce26
Merge: b4683d0 0ff7bec
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Aug 26 20:16:31 2010 +0300

    Merge remote branch 'origin/master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore         |    2 +-
 sources            |    2 +-
 vdr-epgsearch.spec |   11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)
---