merge of 09f9e22a8b02fd6a41aa1d5a558f5ba97103e99a
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 24 Jan 2006 19:48:31 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jan 2006 19:48:31 +0000 (19:48 +0000)
commitc6659135578e8466727b9125de47a7a0e34c8b05
tree3cf010d7992f24dee38eac0bf529338e3627dbb5
parenta3bfe2c3af2d8d6ab64b5d815f2e33b3b455bbaf
parentaabd365082cecfee2096a423d690c8167b756ab5
merge of 09f9e22a8b02fd6a41aa1d5a558f5ba97103e99a
     and fde5d898c22b8382518f54905b699a11addbc8a3