merge of 3395fc22cc5fd1e9a7862619eb6834ffcc6860cf
authorJamie Lenehan <lenehan@twibble.org>
Fri, 26 May 2006 08:31:51 +0000 (08:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 May 2006 08:31:51 +0000 (08:31 +0000)
commitfc01153a70f73eff6c272ae705b1a6a0192055b4
tree7e29a93046725d7d358761ece775d914ff1a52c9
parentda00a360001e1122b8add2c2c95480728c89cadb
parent50f316141f109701317bb6453483f1a80f8aba6c
merge of 3395fc22cc5fd1e9a7862619eb6834ffcc6860cf
     and 5784b72cf5dcca71eb0811f427acc0b4748ff43a