Resync with trunk. Merge branch 'master' of https://code.google.com/p/open-lighting
Resync with trunk.
Merge branch 'master' of https://code.google.com/p/open-lighting

ld3300/ola,nip3o/open-lighting,nightrune/ola,ld3300/ola,nightrune/ola,nightrune/ola,ld3300/ola,nip3o/open-lighting,ld3300/ola,nip3o/open-lighting,ld3300/ola,nip3o/open-lighting,nightrune/ola,ld3300/ola,ld3300/ola,nightrune/ola,nip3o/open-lighting,nightrune/ola,nightrune/ola,nip3o/open-lighting