This pull request has all you need:
https://github.com/bitcoin/bitcoin/pull/97

All transactions for addresses in the wallet are included for free even if normal rules require a fee.