Merge remote-tracking branch 'origin/simple-quiet' into multiarch
authorKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:41:56 +0000 (08:41 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:41:56 +0000 (08:41 -0600)
Conflicts:
configure.ac

fix version number


No differences found