[mate-terminal/f17: 10/11] Merge branch 'master' into f18

[Rex Dieter]

commit 2c22cc968f0e7e3b4960fe47d54712533c1c94af
Merge: f50d7d8 ecf9891
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 18 13:26:49 2012 -0500

    Merge branch 'master' into f18
    
    Conflicts:
    	mate-terminal.spec

 .gitignore         |    1 +
 mate-terminal.spec |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)
---