Netbook commit
merge