merge of '2624307a8e17736c12caa8464687cb09d2f8921a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 Sep 2008 15:21:42 +0000 (15:21 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 Sep 2008 15:21:42 +0000 (15:21 +0000)
     and 'a4639a24e6c6732d95ee6058596bafa6e68f34c3'


Trivial merge