merge of 1627b7b19d1938e0d3ca05099c847514e7cd99b0
authorDerek Young <dyoung@nslu2-linux.org>
Fri, 9 Sep 2005 06:04:41 +0000 (06:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Sep 2005 06:04:41 +0000 (06:04 +0000)
     and ff3a0a7accc550378544e42c89bbda9c1ca395c7


Trivial merge