From: Sam Ravnborg <sam@mars.ravnborg.org>
Date: Tue, 3 Jan 2006 14:59:28 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~4^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8ded4ac018ea706bf7ee926601a27184665c9c28;p=users%2Fhch%2Fuuid.git

Merge branch 'master'
---

8ded4ac018ea706bf7ee926601a27184665c9c28