Andreia Gaita <avidigal@novell.com>

Initial coding:
Zac Bowling <zac@zacbowling.com>
