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)
commitc0fb1623f194f09d6c783bb112d7b27ee8f2c964
treedc694ab732162432986ba1b7be0c2ee36a037680
parent32e17c17bfda2f7a289b4d4d9058bec7903e4a19
parent7bab9963f8c9484d712c729514593df6fbedebe8
merge of 29134267458b518b87fa720d106c0188db1b6131
     and 55e352bed0a52f8ee40f1ab81b902297e574eb7c