merge of 34851fe4aecd36f7bfae3317e45d98f58bb6bc59
authorMatt Reimer <mattjreimer@gmail.com>
Wed, 15 Feb 2006 00:50:07 +0000 (00:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 15 Feb 2006 00:50:07 +0000 (00:50 +0000)
commit9c5dd476be62e2ddbf5cd7b68e9cf6302784235d
tree41334f27d25c3536200cfc3422d729e44dd32fb5
parentb431c1546f415fef00b8b70d1280c6c6f032f0a8
parent8c782f12386e7a0275e8ae98620819122fd8a70a
merge of 34851fe4aecd36f7bfae3317e45d98f58bb6bc59
     and 37212ffa007b0b42f88d05068588f8de0542e356