Merge branch 'master'
authorKumar Gala <galak@kernel.crashing.org>
Tue, 4 Apr 2006 21:10:34 +0000 (16:10 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 4 Apr 2006 21:10:34 +0000 (16:10 -0500)

Trivial merge