merge of 'a49fe2e2da0e39e35809f715b1dcda205597a1ec'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 09:02:54 +0000 (09:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 3 Aug 2007 09:02:54 +0000 (09:02 +0000)
commit97f912b2421b9dda78f3d8282a482bc0d99ce101
tree24cdc3220d440cd6b3aca8e846390426d614116d
parent989813ae7eac936ccd8dbf44e17860cd1e3d8c93
parent3f7a2129233b38191ebe2a50ccc690cbf3d46b23
Merge ... 'a49fe2e2da0e39e35809f715b1dcda205597a1ec'
     and 'f3673f80e35fb4097d5f8c0d985464aa797b71f4'