merge of '048d7a25deec409ecdb2a1dacf3ef6afb4f6359f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:43:15 +0000 (08:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:43:15 +0000 (08:43 +0000)
commit925ae7cfaa7d68869f6cfe2ba5ba36c5e42736d9
tree921877c6eca156589ffc59e274e4867df7bfe2b1
parent71e8456ea2160f4874b31f49999dc4befda80a16
parent0771406832d8d0951c50dd9a07aa05ef4bd05965
Merge ... '048d7a25deec409ecdb2a1dacf3ef6afb4f6359f'
     and 'f38f68f6196f02a72030cf539729f671d94c6542'