merge of '72b5caa4d0825327887c110ab10309e54e23b537'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 12:36:21 +0000 (12:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 May 2008 12:36:21 +0000 (12:36 +0000)
     and 'a858865489e9e014f299d9caaa2c9ce237ec87ac'


Trivial merge