Merge branch 'wip/static-colors'
authorEmmanuele Bassi <ebassi@linux.intel.com>
Thu, 11 Nov 2010 17:53:42 +0000 (17:53 +0000)
committerEmmanuele Bassi <ebassi@linux.intel.com>
Thu, 11 Nov 2010 17:53:42 +0000 (17:53 +0000)
commitdfdd5914142d6c6fd36b52c186d8bfa92c704168
tree12c03fa5d4cd30ee9b0beaace78f66d70f509995
parent47a6cd95e76ef75a6c117424056c5359c5479283
parent6ed6b2a54b5c8f44496399057ad5e58771bfc620
Merge branch 'wip/static-colors'

* wip/static-colors:
  Move tests to static colors where possible
  color: Add named, global colors