explicit_merge of '12e4d92e98860b8d7e48bdb73bfd9efb0e0a7c21'
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 3 Jan 2006 23:38:29 +0000 (23:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 3 Jan 2006 23:38:29 +0000 (23:38 +0000)
commit00f830a1dc2c74a8052f85e3a42801d65cf1e9f2
tree8bc3ec9bf5de23160c21f22b068e70cfe15f6545
parent07e1fc5185995fe409ecc8bf0f1ec1d30ae71bcc
parent02c830b4fad1bf2ec28d1fa9df1188709187912e
explicit_merge of '12e4d92e98860b8d7e48bdb73bfd9efb0e0a7c21'
              and '7de90a055904c4af8890dd5ae8c192bfd41b3fa1'
   using ancestor ''
        to branch 'org.openembedded.dev'