merge of '355cafb7c6689b944b0668d7b743dff6ad6889ec'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Feb 2007 22:20:51 +0000 (22:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 4 Feb 2007 22:20:51 +0000 (22:20 +0000)
commitb700150f3b093619d104a2a3e24b856e5a2f4dbf
tree48c465ec4f9762781f5eaa8c7fce94e0a65a270f
parentb18e1767e1d0f6bc4b6f6e8f319569711a8685da
parent3c687d1dbfd455c79126341112c381cd24f86bdb
Merge ... '355cafb7c6689b944b0668d7b743dff6ad6889ec'
     and '9c738861989606d0fa4e37315bc94abc74cd3078'