merge of '90546772890b2522b88f319019775be22b6e70f2'
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 6 Mar 2007 17:48:07 +0000 (17:48 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 6 Mar 2007 17:48:07 +0000 (17:48 +0000)
commitccab4b3ba6f2ccc5e598c9d2ec6405f4494ca200
treee5ef89417787be33a962905a6a9c6d79e456e6f1
parentbc63d79985ece0bdf9ea69a0df0a25fcc36f6c3c
parentabbb0c6e198af23ee2216bd6849d91a70cb4ba6c
Merge ... '90546772890b2522b88f319019775be22b6e70f2'
     and '9ddb942debcda58f976549da4141ba8488765949'
conf/distro/angstrom-2007.1.conf