merge of e248bc9f4ce090838742bfc40304a32cd2d5cdbc
authorRod Whitby <rod@whitby.id.au>
Wed, 17 Aug 2005 14:51:51 +0000 (14:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Aug 2005 14:51:51 +0000 (14:51 +0000)
     and e4a7fdcbb161ebf763444a06c796d9ea126fa9e1


Trivial merge