merge of '7f97df68d9bbb4bbdb3287edf727a04a5a29c6a8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 21:48:09 +0000 (21:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 21:48:09 +0000 (21:48 +0000)
commit902ba275a6dd0c41d579ee222b287600f062e0dc
tree5f37da063fd7e1e731732b1d6b4dc4b04d80cc06
parent8660878eed049ba2850192caf962b02264aa899c
parentdf2f26608a1f2e8e0f8bb0d4f61b7b64f51289c4
Merge ... '7f97df68d9bbb4bbdb3287edf727a04a5a29c6a8'
     and '9a0caec6fe48a6524346d27828894085bf73636d'