merge of 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
authorJohn Lee <john_lee@openmoko.org>
Fri, 29 Feb 2008 10:18:28 +0000 (10:18 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Fri, 29 Feb 2008 10:18:28 +0000 (10:18 +0000)
commit022ac4bfbd6d85f4accbd23f18138a10b2e9f0de
tree1a6d1e12611c2b3a341f3293af95c8575edc3c4e
parentfe6f8c336429aa31e9b3a74ecd9f1e8a320a8a07
parent1e4b78b265763e2b2d0d430f62b86aab5826a48e
Merge ... 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
     and 'e1563879f370dd02713e036ee932bb571cce4bc4'
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/sane-srcrevs.inc