merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f
authorJustin Patrin <papercrane@gmail.com>
Fri, 13 Jan 2006 18:26:10 +0000 (18:26 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jan 2006 18:26:10 +0000 (18:26 +0000)
commite523c03092fc6cfeda92b045a4d188b328267930
treed7e3f9b624cb642b58492bc459ad3066bb976f68
parent1f1964e9b57efb6ec63ab857c25aa5f9a9836e88
parent20938adc193b05ec07f801b9ed5e4c2a6c4a73c9
merge of 464cb51e4f1333becda8dfa1ccf4f9bbcea5514f
     and b3735f13f3bb7c2565ab1e628c79b04596773c15