[dolphin-connector/f14/master: 3/3] Merge branch 'master' into f14

[poetinha]

commit 1e98e3b0df830dbc16db0172e2255f0571a3a384
Merge: f5d79c3 03a2599
Author: William Lima <wlima at primate.com.br>
Date:   Mon Feb 7 19:34:15 2011 -0200

    Merge branch 'master' into f14

 .gitignore             |    1 +
 dolphin-connector.spec |   11 +++++++----
 sources                |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---