From: William Morgan <wmorgan-sup@masanjin.net>
Date: Fri, 25 Jan 2008 02:51:58 +0000 (-0800)
Subject: Merge branch 'update-fix' into next
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=0c5aecc959b988b057b5d5cf30c2ba6e50cbe70e;p=sup

Merge branch 'update-fix' into next
---

0c5aecc959b988b057b5d5cf30c2ba6e50cbe70e