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)
     and a2bf373810307badc5a8742e077888a4be329c07


Trivial merge