From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 2 Jun 2009 14:41:41 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=b0587850a0cd616fe5340706abae83576952c22d;p=sup

Merge branch 'master' into next

Conflicts:

	lib/sup/poll.rb
---

b0587850a0cd616fe5340706abae83576952c22d