Not a real diff - some resolution by hand
--- FSF	2009-02-05 09:57:49.146650157 +0000
+++ OSI	2009-02-05 09:57:49.132342335 +0000
@@ -1,78 +1,67 @@
 
 Academic Free License
 Affero General Public License
+Adaptive Public License
 Apache License
+Apache Software License
 Apple Public Source License
 Artistic License
+Attribution Assurance Licenses
-Berkeley Database License
-BitTorrent Open Source License
 Boost Software License
-CeCILL
-Clarified Artistic License
 Common Development and Distribution License
 Common Public Attribution License
 Common Public License
+Computer Associates Trusted Open Source License
-Condor Public License
-Cryptix General License
+CUA Office Public License
 Eclipse Public License
-eCos license
 Educational Community License
 Eiffel Forum License
+Entessa Public License
 EU DataGrid Software License
-Expat License
-FreeBSD license
-Freetype Project License
-GNU Affero General Public License
+Fair License
+Frameworx License
 GNU General Public License
-GNU Lesser General Public License
+GNU Library or "Lesser" General Public License
+Historical Permission Notice and Disclaimer
 IBM Public License
-Independent JPEG Group License
 Intel Open Source License
-Interbase Public License
 ISC License
 Jabber Open Source License
-LaTeX Project Public License
-License of imlib2
-License of Netscape Javascript
-License of Perl 5 and below
-License of Ruby
-License of the iMatix Standard Function Library
-License of Vim
-License of xinetd
 Lucent Public License
 Microsoft Public License
 Microsoft Reciprocal License
+MIT license
+MITRE Collaborative Virtual Workspace License
+Motosoto License
 Mozilla Public License
-NCSA/University of Illinois Open Source License
-Netizen Open Source License
-Netscape Public License
+Multics License
+NASA Open Source Agreement
+Naumen Public License
+Nethack General Public License
 New and Simplified BSD licenses
 Nokia Open Source License
-Old OpenLDAP License
-OpenLDAP License
+Non-Profit Open Software License
+NTP License
+OCLC Research Public License
+Open Group Test Suite License
 Open Software License
-OpenSSL license
 Original BSD license
-Phorum License
 PHP License
-Public Domain
 Q Public License
 Python license
 Python Software Foundation License
 RealNetworks Public Source License
-SGI Free Software License B
-Standard ML of New Jersey Copyright License
+Reciprocal Public License
+Ricoh Source Code Public License
+Simple Public License
+Sleepycat License
 Sun Industry Standards Source License
 Sun Public License
-The Clear BSD License
-Unicode
-W3C Software Notice and License
-WTFPL
-X11 License
-XFree86 1.1 License
-Yahoo! Public License
-Zend License
+Sybase Open Watcom Public License
+University of Illinois/NCSA Open Source License
+Vovida Software License
+W3C License
+wxWindows Library License
+X.Net License
 zlib/libpng license
 Zope Public License