merge of 29134267458b518b87fa720d106c0188db1b6131
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 1 Sep 2005 19:41:34 +0000 (19:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Sep 2005 19:41:34 +0000 (19:41 +0000)
     and 55e352bed0a52f8ee40f1ab81b902297e574eb7c


Trivial merge