merge of 1a138e228b9a27d00855a6c27775e9b2430220a2
authorJustin Patrin <papercrane@gmail.com>
Mon, 17 Oct 2005 23:15:06 +0000 (23:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 17 Oct 2005 23:15:06 +0000 (23:15 +0000)
commit8cfbec017c980b26142ec8494e0bf321256bb332
tree1c70e500490e3cf0d25b327e0a226a9b1ed75351
parentc68c62221ffd271d95e29985d829f94ed6e9f9ec
parent11737573c07a37e3b53e1a035ede0f7d0d31aeb8
merge of 1a138e228b9a27d00855a6c27775e9b2430220a2
     and b7f6ccdd490a93fd12ab881d78d03c39cc31ecba