Merge commit 'local_master/master'
authorroot <root@cassidy.cs.princeton.edu>
Tue, 5 Oct 2010 08:43:18 +0000 (04:43 -0400)
committerroot <root@cassidy.cs.princeton.edu>
Tue, 5 Oct 2010 08:43:18 +0000 (04:43 -0400)
commite18dcad0ebab4eb317b929a70e75970be9892e3d
tree78205c34459d8a5c1e4676caba3d23b95ff060a4
parente93fe859183a838d68c6eaafaded310a176bba87
parentc97dc9b96bf669661184b73990e11352f007e716
Merge commit 'local_master/master'
kernel-2.6.spec