merge of '4b865f129d7c784106bb82861c16cc6330c629a9'
authorPaul Sokolovsky <pmiscml@gmail.com>
Wed, 3 Jan 2007 23:22:42 +0000 (23:22 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Wed, 3 Jan 2007 23:22:42 +0000 (23:22 +0000)
commit91818574fb20e98aed69f4f4586e3f971e17f013
treee025ebd5590ec3ca7edf69a871753f85e10598f5
parentc73693c12be6d852f243ed5bb5b8d585943e8003
parent84a4706fc5292c926fb1126857cd350b62ddd0b4
Merge ... '4b865f129d7c784106bb82861c16cc6330c629a9'
     and '7e82eca3f8662bfb12dc49e93daed21b2aa8feeb'
conf/distro/angstrom-2007.1.conf