merge of '0ff7b192e1f386a42dc2619236091fbae7c94f27'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 11:55:14 +0000 (11:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Jan 2008 11:55:14 +0000 (11:55 +0000)
commitebefee9c1bb37862a166f97b5913ad9f40a3e7a9
tree2acce02b49a58f3d044e24e36afd7c7d49d913c0
parent43f3297970d794c9720998ea07ad45d57b371b71
parentb82d11fb2d53a2f2c00041786c92e2f75e1a565f
Merge ... '0ff7b192e1f386a42dc2619236091fbae7c94f27'
     and 'f26d698029356f75985aa3a48399bc7aa8f08144'