merge of 19c7f21b75299e2823cd9f6ccedbeebb643f4e53
authorJamie Lenehan <lenehan@twibble.org>
Mon, 19 Jun 2006 10:02:10 +0000 (10:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 19 Jun 2006 10:02:10 +0000 (10:02 +0000)
commit6b49a918f4e7160073612a8e833d1600cad3cae3
treed8a68aad659d061e6f00f55d4e98616780e7c9bc
parentbe040497fa491b257f23549c8042f9c3b3d6baff
parentc45177b0a5e5ae93918786a7069da4fb1c24b83d
merge of 19c7f21b75299e2823cd9f6ccedbeebb643f4e53
     and a2bf373810307badc5a8742e077888a4be329c07