merge of 'af86a1fd345d2e344f7ade9460024f19319d09cf'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 14:58:59 +0000 (14:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 20 Oct 2007 14:58:59 +0000 (14:58 +0000)
commit53a5d5de8bf8fda7354395843f7dcf5bb1113995
tree58a6f6e8943e3b629b77f128e60f81be0a0b9c03
parentd129deb895698eaf8eef9c10da8b7fc1b3ed4fe6
parent21e6f6a2e45fe4a03b4b7d96485d52a04a8f1278
Merge ... 'af86a1fd345d2e344f7ade9460024f19319d09cf'
     and 'f6d103c98aabe04b32d3cba8cf288cff1f5ad67f'