[shared-desktop-ontologies/f12/master: 9/9] Merge remote branch 'origin/f14/master' into f12/master

[Rex Dieter]

commit 50450f3ec9b15c2f79177c3eac2df6a49b9cc62e
Merge: 30521b5 1d80c9c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 07:15:55 2010 -0500

    Merge remote branch 'origin/f14/master' into f12/master
    
    Conflicts:
    	.gitignore
    	shared-desktop-ontologies.spec
    	sources

 .gitignore                     |    2 +-
 shared-desktop-ontologies.spec |    5 ++++-
 sources                        |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---