merge of '8dccbf106093aaa7b62b2a96962945185534c923'
authorJohn Lee <john_lee@openmoko.org>
Wed, 27 Feb 2008 07:50:52 +0000 (07:50 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Wed, 27 Feb 2008 07:50:52 +0000 (07:50 +0000)
commitd6f3635f2e2baa680d878461fc8fa9b68c51162b
treea07627fc6746f21a02a543381681f1cb1320b38d
parentb14906e8fa695a85b9ddf27838c959be1c8a5fad
parent9d22cb8106117d2d923bf7b2c263bf9e31b5305f
Merge ... '8dccbf106093aaa7b62b2a96962945185534c923'
     and 'c50825ba187c292f591cf43c91216cebffb5e290'
conf/checksums.ini
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
packages/asterisk/asterisk_1.4.17.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb