merge of 15a80a372d1017d221f1e725cae0070d170078cb
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 21:17:19 +0000 (21:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 21:17:19 +0000 (21:17 +0000)
     and dbf92f630b3fa1d33d2075e276de7d428f1b8aaa


Trivial merge