merge of 74c59e4808f6dc67198a09daba0fbe60e5560ec6
authorRod Whitby <rod@whitby.id.au>
Sat, 12 Nov 2005 03:30:42 +0000 (03:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 12 Nov 2005 03:30:42 +0000 (03:30 +0000)
     and cc19bfba0e11a6d9efa601d46a5da31d5b24eb1e

1  2 
packages/linux/nas100d-kernel.inc

Simple merge