merge of '37503acf69411b447655a4711ed7b553120c14df'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jan 2008 17:33:28 +0000 (17:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Jan 2008 17:33:28 +0000 (17:33 +0000)
commitc951cce8e94630d41ce362cdfc1fecea24066325
tree592504ab933cb32c79601f361535db8bdca2ba60
parent8eaa2ab5a0006f8010425f95246ae27cca59a793
parent1052bee548c8194cbee9298e947c00937f68450a
Merge ... '37503acf69411b447655a4711ed7b553120c14df'
     and '99d10c4327664b741cfed74f3f99ac3f6d9e5b7b'