merge of '18239eb8813140e4bf4a47f026a9ff1328685d29'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Feb 2008 01:49:05 +0000 (01:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 13 Feb 2008 01:49:05 +0000 (01:49 +0000)
commit7cd0c7e0f2000211f05791518f38a3d017beffec
tree6b4105333f3209ef113ce09b4e0da2615bdcd342
parent3132647d57bab70919f8207d237878056378345d
parentedda361ada8aa28208c77d95d5b4387586d333c2
Merge ... '18239eb8813140e4bf4a47f026a9ff1328685d29'
     and '5322568ecee532657239a959db7be8e868de87f2'