[mate-conf-editor/f17: 5/6] Merge branch 'master' into f18

[Rex Dieter]

commit c4771f92b7b93d419d09b1d45cdfaa983e519cc6
Merge: 4f70d31 07430d1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 18 13:30:27 2012 -0500

    Merge branch 'master' into f18

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---