merge of '9baaea2c747482336eaf77e055c74f2f21596957'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 06:06:21 +0000 (06:06 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 May 2008 06:06:21 +0000 (06:06 +0000)
commit9bf42f65af5bf511454d16a684ee622ae5b8fabe
tree358803e58abb5824966e66569d88cd84d4cfe97b
parent56c6d062346a663fe7b62e80e51b0b9c09d9ceb4
parent3aade2f08921b56780fc9b1997ee1cc581e57b22
Merge ... '9baaea2c747482336eaf77e055c74f2f21596957'
     and 'f74141b6df53f890c26db2848828471f337744ac'