merge of '5d6e88196c5eb74c163fb8c3309cbd1029d246a3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 23:53:47 +0000 (23:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 26 May 2008 23:53:47 +0000 (23:53 +0000)
     and 'd31a66aa95e2e73c0df082e42443636e23249325'


Trivial merge