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