merge of '22070216e65cf80581c36bade36576e881fc55b9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Mar 2008 18:59:48 +0000 (18:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Mar 2008 18:59:48 +0000 (18:59 +0000)
commita010f2d39074bf5e4b94128bc149579751f9b462
tree408dffb42e61324221948882bd0802d278ca4920
parent150ff5af63affa96bc52751a4593dc2ce824c9b5
parent3fb22061e1bfc96e58862a6cf774cbd3f2784fa9
Merge ... '22070216e65cf80581c36bade36576e881fc55b9'
     and 'cb11d308ad141da3565a5b53318e124406257a86'