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

[Rex Dieter]

commit 3dfab9e95c6379b511f796e11dd1ef617486333a
Merge: 54f78d2 1d80c9c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 07:14:51 2010 -0500

    Merge remote branch 'origin/f14/master' into f13/master

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