merge of '41716f313f0efdbc890ccb2a7a5d8c24cae3ed69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 12:53:07 +0000 (12:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 16 Mar 2008 12:53:07 +0000 (12:53 +0000)
     and '6a15d9f49ea8804172ee689f3791cd3ee9ef66d6'


Trivial merge