merge of 42fa354b672b23377813b6b278bf06236f7125ac
authorRod Whitby <rod@whitby.id.au>
Tue, 28 Mar 2006 20:44:34 +0000 (20:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 28 Mar 2006 20:44:34 +0000 (20:44 +0000)
     and 7fb75dee044e15146c4486204f08a3d8b6f70c49


Trivial merge