merge of f17d3087897a984c0e341c5bdec44b96a96c2bc5
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 22 Jan 2006 12:53:24 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 12:53:24 +0000 (12:53 +0000)
commitc687aaf591ddb124967cb9c70e523cbe33afca1d
treeca44a1512f564d6efe4c5bc7215fec56557a1cd4
parent1c4dae70c0c35c8bcd640e69ac2c09ee5a3b6cf1
parent3822ed3850afaa2e350019c1f56d982fb039adb6
merge of f17d3087897a984c0e341c5bdec44b96a96c2bc5
     and f9b462770824431301ae59aeb7968ecd519a5121