Merge branch 'origin' into kconfig-for-1.3.1
authorGrant Likely <grant.likely@secretlab.ca>
Tue, 20 Nov 2007 15:19:56 +0000 (08:19 -0700)
committerGrant Likely <grant.likely@secretlab.ca>
Tue, 20 Nov 2007 15:19:56 +0000 (08:19 -0700)

Trivial merge