merge of '486564afb93dc07dd531c82b2f7735424a813a69'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Apr 2008 19:59:01 +0000 (19:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 10 Apr 2008 19:59:01 +0000 (19:59 +0000)
commit85c441332af87ac81600d76d02efdafba82f2d9f
tree189e740ccd954ef7e2ea5b5af849bc6d5c70ef56
parent901686579ba3b5f564682e11924ca0427a650f77
parent461165e5d50794c1f1e96e674524eaae05abc301
Merge ... '486564afb93dc07dd531c82b2f7735424a813a69'
     and '894eccb0f6fd46f8c72a9457612feba217d953b6'