Merge remote-tracking branch 'vudentz/master'
authorColin Guthrie <cguthrie@mandriva.org>
Fri, 18 Mar 2011 00:10:27 +0000 (00:10 +0000)
committerColin Guthrie <cguthrie@mandriva.org>
Fri, 18 Mar 2011 00:10:27 +0000 (00:10 +0000)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge