Merge commit '4c91cd28105485ae04b5cc9e5150e346fddf0874' into upstream-merge
commitb3dd99042ac0e7c91c90176f850a29545d7c0694
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:24:46 +0000 (28 11:24 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:24:46 +0000 (28 11:24 +0000)
tree8ea2d89ecd2914f19bf363b26f4850b7790c3dd3
parent5f261285e88c1ca556ea561364a2b1d49474c577
parent4c91cd28105485ae04b5cc9e5150e346fddf0874
Merge commit '4c91cd28105485ae04b5cc9e5150e346fddf0874' into upstream-merge

* commit '4c91cd28105485ae04b5cc9e5150e346fddf0874':
  musicpal: use qdev properties for configuration.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>