merge of 2356b89a5a998c175566c00320d564db9d1d78ba
authorGraeme Gregory <dp@xora.org.uk>
Fri, 17 Feb 2006 09:36:23 +0000 (09:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 17 Feb 2006 09:36:23 +0000 (09:36 +0000)
commit5e7d8e5b6cd1cf72f9b83898b519201f7bdcb5d5
treec92221a5d6a4635b686ffa6d76b1b2676710e68e
parenta7a798668152bcf055f53ed05a38cbbb273bbb16
parent21b560f6fb943f70471666cf8ad715e1f98775e7
merge of 2356b89a5a998c175566c00320d564db9d1d78ba
     and 62f57c5089eb06f79c609eda357b7623f837db33