merge of 6332ba3ac06255d82b54e9a1a69e726c1de4d14f
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 19:30:54 +0000 (19:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 19:30:54 +0000 (19:30 +0000)
commitef83a04e3672a415e651bcd45ad5bbf74a85243a
tree1fc7964f99b8ec4c33fc7e6f170d1deb828ab27e
parenta2af2e93089ec7d3c182633e4a8713f566369ed3
parentedbc2e0dd17353e0b85b50a24d766a502789ece4
merge of 6332ba3ac06255d82b54e9a1a69e726c1de4d14f
     and e8386a3fd1880af0122ee50c8a1b249ada79c9ea