merge of 7480e1b4a1acb42268fac59998ddedb41c6651a9
authorRod Whitby <rod@whitby.id.au>
Fri, 14 Apr 2006 22:19:48 +0000 (22:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Apr 2006 22:19:48 +0000 (22:19 +0000)
     and f1bf6327fe5a564c08a15eb5c9f9cec97d1bedf8


Trivial merge