merge of 417b6b1ab4151082a038c4eb1bc88276a46675b0
authorJustin Patrin <papercrane@gmail.com>
Fri, 7 Oct 2005 16:59:31 +0000 (16:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Oct 2005 16:59:31 +0000 (16:59 +0000)
commitec4471204f98aea123a32d1b1c7f01c68f47bb90
tree59155b22df25616f7cac592aa5878ea2727e1ac7
parenta05f01de2c518771dceb6ab93f2a7c487d25c63a
parentfa12b55de5065e65b088529c06888c6b725f265a
merge of 417b6b1ab4151082a038c4eb1bc88276a46675b0
     and d158643df91483ff93864d58c92e889b0050dea6