merge of '32d243e53a633a69a4061e712897dae706da9eee'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Aug 2007 10:57:13 +0000 (10:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 14 Aug 2007 10:57:13 +0000 (10:57 +0000)
commit25ff09c94a8f2faea23bfb20760a682bc6c03f87
tree057bfc65ce35a42e3f3a5233d5929eaa3976b6b8
parent192b75fee20fbe56dd1cf3326ed77eb4729db37b
parente0e9e209534a8fb9fc66ff3f4565453555df6e83
Merge ... '32d243e53a633a69a4061e712897dae706da9eee'
     and '816470cc5a58c92e0a2b36e6ca0db599d2cf7e38'