merge of 2e3186680931aa0d42ca8ef7a58d57ab879c666d
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 14 Aug 2005 21:42:36 +0000 (21:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 21:42:36 +0000 (21:42 +0000)
     and 8cf91caaca9410d5dd62925ca7d54919cc672af0


Trivial merge