Merge branch 'master'
authorKumar Gala <galak@kernel.crashing.org>
Mon, 20 Mar 2006 16:53:56 +0000 (10:53 -0600)
committerKumar Gala <galak@kernel.crashing.org>
Mon, 20 Mar 2006 16:53:56 +0000 (10:53 -0600)

Trivial merge