merge of '26a2db272eb8a8c45759850000cba2e07e5de47e'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 11:45:25 +0000 (11:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 30 Apr 2008 11:45:25 +0000 (11:45 +0000)
     and 'c7279b542db917aa1365c575fa3b2d81439abf03'


Trivial merge