merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 22:13:10 +0000 (22:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Aug 2008 22:13:10 +0000 (22:13 +0000)
commit06630a469cda2e779b8ccf3de125f18569cb67b1
treed688f854e5e91197eaf98786480b5d4418486186
parent23c0b79836cbadbfbdfa5f63b39815f85d400984
parent5a7ed4ea4a4a4166f4cc94b3ca5b162463d408e3
Merge ... '0c72fca9e0c0a27bd39068df21078215a4362b1c'
     and 'df88361619c93df2c6573ec7b6bdf56f0e4cda94'