merge of '2619abe3692dfbe579ad38b8965c62893fda94d5'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 12:24:03 +0000 (12:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 15 May 2008 12:24:03 +0000 (12:24 +0000)
     and '98d4b3ddc69df8462618e68ca96d00859a38f872'


Trivial merge