[eclipse-pydev/f18: 11/11] Merge branch 'master' into f18

[swagiaal]

commit d19a9046f1d886adb44c8dc78a74ab3ad8a28817
Merge: a33f05a 73955d6
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Wed Apr 24 13:30:25 2013 -0400

    Merge branch 'master' into f18
    
    Conflicts:
    	eclipse-pydev.spec

 eclipse-pydev.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---