From: <mako@atdot.cc>
Date: Sun, 7 Jun 2009 09:44:11 +0000 (-0400)
Subject: merge everything back from mainline branch
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/da8a3c5c6efcad4e4a5424a09c0479f7ee52a9ec

merge everything back from mainline branch
---

da8a3c5c6efcad4e4a5424a09c0479f7ee52a9ec