merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'
authorJohn Lee <john_lee@openmoko.org>
Fri, 7 Mar 2008 13:05:07 +0000 (13:05 +0000)
committerJohn Lee <john_lee@openmoko.org>
Fri, 7 Mar 2008 13:05:07 +0000 (13:05 +0000)
commit0b098d35b319ed6c00f363cb0d4fd447d7fb8d57
treea830bf983a66688f5648cd83e362c4fea2f48f6b
parent06fb90eb31b0b85a5c5c7adf185ce2515c5b1220
parentd3bbd28f22fbd8e9d097081fa128ae18197f36e1
Merge ... '26501141207c84e31e0f43c5795a15c0f16dbce5'
     and '86618f966282489d43b51fbf0ee93b954ac615ae'
conf/distro/include/sane-srcrevs.inc
packages/gypsy/gypsy.inc