[mate-panel/f18: 2/2] Merge branch 'master' into f18

[Dan Mashal]

commit 72cb935d7609b38c176992d0183045b0015c8a25
Merge: 3bf9202 dc61783
Author: Dan Mashal <dan.mashal at gmail.com>
Date:   Mon Nov 26 21:24:56 2012 -0800

    Merge branch 'master' into f18

 mate-panel.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---