Merge
authorChris Lord <chris@openedhand.com>
Wed, 16 Feb 2005 21:51:49 +0000 (21:51 +0000)
committerChris Lord <chris@openedhand.com>
Wed, 16 Feb 2005 21:51:49 +0000 (21:51 +0000)
commit1bb39af626c79a6aa0d3c76fd3183f291238585b
tree66c017a445fabdee0b674fa4a5a4bf6947f835ff
parent868e9cbdaae715ce90b765c636583d6ca555495d
Merge

2005/02/16 21:49:42+00:00 (none)!cwiiis
Use ?= instead of = for provider of xserver and virtual/kernel in collie.conf

BKrev: 4213c075ACmycGG0JicH6COpPjXmQQ
conf/machine/collie.conf