From: David Teigland <teigland@redhat.com>
Date: Fri, 20 Jan 2006 08:59:41 +0000 (+0000)
Subject: Merge branch 'master'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=044399b2cb6ad2d7f63cfca945268853d7443a4d;p=linux-edison.git

Merge branch 'master'
---

044399b2cb6ad2d7f63cfca945268853d7443a4d