Merge commit 'remotes/gitorious/master'
[cpumem-applet] / icon.png
icon.png