merge of '5529fcc6533f38f6369900c99f864fda054a188d'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 11:53:09 +0000 (11:53 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 11:53:09 +0000 (11:53 +0000)
commit75026ab34ab6dd2d15bb02e8c8321f49a9c67d2d
treecf29c30cc02609d0ac4948c58388802fba6b2f35
parent42565b03e846f7ae4e153bd6ffe9cb702daaf926
parent29a9871a5574cf5557063127bec731c28a43522f
Merge ... '5529fcc6533f38f6369900c99f864fda054a188d'
     and 'ff0f00669a09b72c8939fb218f04c9f83bef3297'