[c++-gtk-utils/f17: 2/2] Merge branch 'master' into f17

[airwave]

commit 3d7dea603a46a4effb8ca7c09c754c63d6478101
Merge: bcd6306 034e6f5
Author: Frederik Holden <frederik+fedora at frh.no>
Date:   Tue Apr 2 22:43:55 2013 +0200

    Merge branch 'master' into f17

 c++-gtk-utils.spec |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
---