merge of '1ae309a70c139143a4704b5def248a5be0b1a810'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 22:41:15 +0000 (22:41 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 22:41:15 +0000 (22:41 +0000)
commit715d0f2c86c693007951fc6560f0e14e46076cb3
tree8b32b218d58a3e2871e534d5c77d36a7877ef997
parent51755d3df0e8ca4458fa788229bf84a02d12bf7a
parentcdd621e16e6865cda9379477754649c3d02865f6
Merge ... '1ae309a70c139143a4704b5def248a5be0b1a810'
     and '327945003e321bca077ca44f526f2f0463ff8277'