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)
commitd85d9d55bd736f70b821ffce61db1b41b8aec2b5
tree702b62a6493aebb1940bf65f5a871a46413c2064
parent51e42c17e8a759a080b6767c8a137875cec2b8ac
parent7c929a18b13aa601a10609bba1a11d36b978c409
Merge ... '0d2aa1a8dedba904e771677d29a307eb39ba73ff'
     and '3e3e64c7187462ff0792e72f0fc7ffaa964aff0c'