diff Makefile.am @ 21075:c14002f7f5ef

merge of '6ac3a8102758d7f3ccaf714b4252c81832e6bcb7' and '71e9513a1f0282f4d7261c0be8bbecb27be04f9a'
author Gabriel Schulhof <nix@go-nix.ca>
date Mon, 08 Oct 2007 15:36:31 +0000
parents 4c26b23e7859
children f34539eb7a61
line wrap: on
line diff