merge of '9814a7ac8b5ebeadd190ad216196e5efd3a70ff3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jan 2008 13:18:41 +0000 (13:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 27 Jan 2008 13:18:41 +0000 (13:18 +0000)
     and 'b5e43fe5c6d401e028b978c17ce615d2a97900ef'


Trivial merge