[gnome-desktop/f15/master: 3/3] Merge branch 'master' into f15

[Christopher Aillon]

commit 871455c62279f3434a268d5abf5f6b5f410feba2
Merge: 20e7a4f 1746e30
Author: Christopher Aillon <caillon at redhat.com>
Date:   Tue Apr 5 07:30:15 2011 -0700

    Merge branch 'master' into f15
    
    Conflicts:
    	gnome-desktop.spec

 gnome-desktop.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---