merge of '9877d1d45993745222565aabcf9dda0a305cb1d5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jul 2007 19:34:35 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 24 Jul 2007 19:34:35 +0000 (19:34 +0000)
commitaee2e59f7a77faf0d0f8de429606eaaed203fc3c
tree08040f7532b5f1e29401f14499be1f9b6a71d23b
parentf5c6a7fdebeffa1fd8addc54d77f1a7d774e1358
parent87bced1204d1fb7bcca24472722af24f498b18b1
Merge ... '9877d1d45993745222565aabcf9dda0a305cb1d5'
     and 'b30f5071d106efd92d97d7e0c735332475c0ee26'