From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Tue, 3 Jan 2006 14:59:28 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8ded4ac018ea706bf7ee926601a27184665c9c28;p=linux-edison.git

Merge branch 'master'
---

8ded4ac018ea706bf7ee926601a27184665c9c28