merge of '5ffe474ec8d4aacce010a309c84060d66754822d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 May 2007 12:23:08 +0000 (12:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 31 May 2007 12:23:08 +0000 (12:23 +0000)
commiteaba617d36cfe2a9c15a0edb3db8874fd0403332
treeb5ed9980b8f150b100a474d79fe20c2017d80c26
parentea0f18cab27893944c5a3c62a709fe42286a5c26
parenta441b927775fa54ee7e3bae2292719fd4c9179e9
Merge ... '5ffe474ec8d4aacce010a309c84060d66754822d'
     and '89d494bfa41c385b66a8531e7af580bc43ed3e15'