merge of 48e22a27d72e0291a7522958cfc2305284cb8d98
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 30 Apr 2006 13:03:25 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Apr 2006 13:03:25 +0000 (13:03 +0000)
     and 6b52726b2e4761c9b7b4858f6bdbc723e606359a


Trivial merge