merge of 77342d81c716241ae54845c3c0be5803bf01e464
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 4 Sep 2005 21:32:07 +0000 (21:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Sep 2005 21:32:07 +0000 (21:32 +0000)
     and a73d224263913987d0261a9061f9cdc04b853508


Trivial merge