merge of 0e717bbdf4b51eb5e38424e61b118ac408fe5dbb
authorDerek Young <dyoung@nslu2-linux.org>
Wed, 7 Sep 2005 20:15:56 +0000 (20:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 20:15:56 +0000 (20:15 +0000)
     and f7df54703e89d2fcf70786569158e88ba65e2ef0


Trivial merge