merge of '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
authorKoen Kooi <koen@openembedded.org>
Sun, 23 Dec 2007 10:50:30 +0000 (10:50 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 23 Dec 2007 10:50:30 +0000 (10:50 +0000)
commite49ed8da00b7a5d874fd92a806c6b036a726069c
tree4c2986b1f377b0363e6637cc792e8e553c2b39a4
parent95580064683ef83263017dce9b610c74306348bb
parenta5ab4c1e92a80b977b53072b349e05ab0f097dd1
Merge ... '6765ce1f621a9ef917ba1521afc7b81013e14dc2'
     and 'fcc520f13c2e5df6e6b7d52dcbfb32cb1750c941'
conf/distro/include/angstrom.inc
packages/linux/linux.inc
packages/linux/linux_2.6.23.bb