merge of '1a24470f67b2aef1d747c4c3f8412c0fdb330f5d'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Mar 2008 21:58:19 +0000 (21:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 1 Mar 2008 21:58:19 +0000 (21:58 +0000)
     and '5249a366bb4d53c7531eae39339bc5a264436a79'


Trivial merge