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

[Rex Dieter]

commit 54f78d29ebd6b6a2f72bd78ccf07b302153a4765
Merge: 5069601 ed350ad
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Sep 10 07:14:27 2010 -0500

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

---