From: root <root@cassidy.cs.princeton.edu>
Date: Tue, 5 Oct 2010 08:43:18 +0000 (-0400)
Subject: Merge commit 'local_master/master'
X-Git-Tag: linux-2.6-27-28~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e18dcad0ebab4eb317b929a70e75970be9892e3d;p=linux-2.6.git

Merge commit 'local_master/master'
---

e18dcad0ebab4eb317b929a70e75970be9892e3d