merge of '0d2aa1a8dedba904e771677d29a307eb39ba73ff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jan 2008 22:17:56 +0000 (22:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 3 Jan 2008 22:17:56 +0000 (22:17 +0000)
     and '3e3e64c7187462ff0792e72f0fc7ffaa964aff0c'


Trivial merge