[eclipse-linuxtools/f18: 5/5] Merge branch 'master' into f18

[swagiaal]

commit 92c3d0fdfa35e2db9c9c767fa74ae77a7ea4a0c8
Merge: 7ca6eb2 d71f42a
Author: Sami Wagiaalla <swagiaal at redhat.com>
Date:   Thu Jan 31 10:07:26 2013 -0500

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

 eclipse-linuxtools.spec |   37 ++++++++++++++++++++++---------------
 1 files changed, 22 insertions(+), 15 deletions(-)
---