merge of '506e7ee5f030358bf855b41fcb531ab4c662fffe'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Oct 2007 20:05:16 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Oct 2007 20:05:16 +0000 (20:05 +0000)
commitbc8b812632eaf3528163b528ca35db8e42d188d5
tree28bb8ff4677e16cf3929db5197b5262fdd53f70d
parente50f3ca9b32e6698a193e10d1f97f698e729ec89
parentd1f179f470466c3ff18855ba7c4bc9ca41fab2df
Merge ... '506e7ee5f030358bf855b41fcb531ab4c662fffe'
     and '7b3eb3f553b8888f88b87b06f87fe00039a43031'