merge of 'bd1aedcfc0d89a11dd3dbbdca29b177ebb37278a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Apr 2007 17:53:08 +0000 (17:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Apr 2007 17:53:08 +0000 (17:53 +0000)
commitf9905ac0bd9cd21bda88259bb155361021cad38a
tree4c94dafa95c958c58f12c9ff6abc81c1f482a9c1
parentea816aafec72ce5e90e8018f890c10c28fdfe218
parentf866f386936e9a12f6be2c76e37e36035b0a9b8a
Merge ... 'bd1aedcfc0d89a11dd3dbbdca29b177ebb37278a'
     and 'bd57e3a2384dcb07934621216542ba6fc94f536e'