merge of 067348788424405023bc8971f401fd647ff123d2
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 29 Nov 2005 17:53:31 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 29 Nov 2005 17:53:31 +0000 (17:53 +0000)
     and 7436e5bd502644f73a27f1d58324cbe48bccb511


Trivial merge