merge of 0e127465aab36f6067412b4ae8dc1d143975a5d2
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 26 Aug 2005 10:14:00 +0000 (10:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 26 Aug 2005 10:14:00 +0000 (10:14 +0000)
     and 13f41f22b28195db22a3edccf3d65864ffb89f46


Trivial merge