[plowshare/f14: 17/17] Merge with master branch

[Elder Marco]

commit 9b0000dda94bf8eff638eaab6a943557bb4f8441
Merge: d9fa32b 204baf1
Author: Elder Marco <eldermarco at gmail.com>
Date:   Tue Nov 15 20:47:17 2011 -0200

    Merge with master branch

 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
---