merge of '2b710e1818e35c1ae6f03e19452a17638f3b8048'
authorPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Jun 2007 08:49:48 +0000 (08:49 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Thu, 21 Jun 2007 08:49:48 +0000 (08:49 +0000)
commit7ebefcff1fdc6993a30d1d6789a90c54578068e4
tree7f656e7b251105ed59088873071928d4fb1737ba
parent11cd48c28ef8e701fc43b9905a3a4f7af4fb5c8f
parent35673b07fcb65e7109ed0430a9a4aa7e4313d437
Merge ... '2b710e1818e35c1ae6f03e19452a17638f3b8048'
     and '9a039e377450d290fde23e8f83821bd022343fd4'
conf/distro/angstrom-2007.1.conf