From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 12 Dec 2005 20:24:45 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b1086eef813ecee09bd6b8ae364acf0fad065cba;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'master'
---

b1086eef813ecee09bd6b8ae364acf0fad065cba