Merge commit '71093711589dafcb920dc3bc9bb811eaf8b14101' into upstream-merge
commit7ebb1028658725c7abc914fe29078d40d1c1f65e
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 6 Apr 2010 00:37:52 +0000 (5 21:37 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 6 Apr 2010 00:37:52 +0000 (5 21:37 -0300)
treeb299a12218824e650bab37582faf8bbab0434d37
parent61635985644027e6de56b97e2b195e0c871480f5
parent71093711589dafcb920dc3bc9bb811eaf8b14101
Merge commit '71093711589dafcb920dc3bc9bb811eaf8b14101' into upstream-merge

* commit '71093711589dafcb920dc3bc9bb811eaf8b14101':
  Compile pcspk only once

Conflicts:
Makefile.objs
Makefile.target

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>