merge of '8e9358ba32e8e49147324d9632bc8d1a27433a5d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 18:48:19 +0000 (18:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 23 May 2008 18:48:19 +0000 (18:48 +0000)
commitd21e9e88061afa6f1a702b9d146506fa7d38cf91
treefbf73736a42773b4f4e2bc909ffe5c5e612d6e34
parentf4529bc58d0a34fca989f49db6c28e4c65c0bfc2
parent8a96efc7231a2be5e610961cd1116e1ce4180f11
Merge ... '8e9358ba32e8e49147324d9632bc8d1a27433a5d'
     and 'df4a3a852ea0d6186f4b67d34c4166ca14987320'