merge of 0b4f1ff980558815d31881bb337ccd459fa4af3a
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 14 Aug 2005 15:20:16 +0000 (15:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 15:20:16 +0000 (15:20 +0000)
     and 703248fa953456fdca6dcb68233a4bb5079fa7d4


Trivial merge