Description of problem:
When updating gnome-desktop3 from updates-testing, a file conflict prevents it from being installed:

$ yum update gnome-desktop3
Loaded plugins: langpacks, refresh-packagekit
Adding en_US to language list
Setting up Update Process
Resolving Dependencies
--> Running transaction check
---> Package gnome-desktop3.x86_64 0:2.91.90-1.fc15 will be updated
---> Package gnome-desktop3.x86_64 0:2.91.91-1.fc15 will be an update
--> Finished Dependency Resolution

Dependencies Resolved

============================================================================================================================================================================
 Package                                    Arch                               Version                                    Repository                                   Size
============================================================================================================================================================================
Updating:
 gnome-desktop3                             x86_64                             2.91.91-1.fc15                             updates-testing                             560 k

Transaction Summary
============================================================================================================================================================================
Upgrade       1 Package(s)

Total size: 560 k
Is this ok [y/N]: y
Downloading Packages:
Running rpm_check_debug
Running Transaction Test


Transaction Check Error:
  file /usr/share/gnome/help/gpl/zh_CN/gpl.xml from install of gnome-desktop3-2.91.91-1.fc15.x86_64 conflicts with file from package gnome-desktop-2.32.0-6.fc15.x86_64
  file /usr/share/gnome/help/lgpl/zh_CN/lgpl.xml from install of gnome-desktop3-2.91.91-1.fc15.x86_64 conflicts with file from package gnome-desktop-2.32.0-6.fc15.x86_64
  file /usr/share/omf/gpl/gpl-zh_CN.omf from install of gnome-desktop3-2.91.91-1.fc15.x86_64 conflicts with file from package gnome-desktop-2.32.0-6.fc15.x86_64
  file /usr/share/omf/lgpl/lgpl-zh_CN.omf from install of gnome-desktop3-2.91.91-1.fc15.x86_64 conflicts with file from package gnome-desktop-2.32.0-6.fc15.x86_64

Error Summary
-------------

Version-Release number of selected component (if applicable):
gnome-desktop3-2.91.91-1.fc15

How reproducible:
Always.

Steps to Reproduce:
1. Run 'yum update gnome-desktop3'
  
Actual results:
Transaction aborts because of files conflicting with package gnome-desktop.

Expected results:
Transaction completes successfully.

Additional info:
None.