This patch resolves some conflicts between the Python 2.5 and Python 2.6 builds of the desktop bindings and setuptools.
Laca -------------- next part -------------- A non-text attachment was scrubbed... Name: p.diff Type: text/x-patch Size: 5591 bytes Desc: not available URL: <http://mail.opensolaris.org/pipermail/jds-review/attachments/20090213/ec6516a7/attachment.bin>
