Merge branch 'master' of git@git.moblin.org:spectacle 0.8
authorAnas Nashif <anas.nashif@intel.com>
Sat, 2 Jan 2010 07:45:59 +0000 (23:45 -0800)
committerAnas Nashif <anas.nashif@intel.com>
Sat, 2 Jan 2010 07:45:59 +0000 (23:45 -0800)
commit887f70167d2eddac86e70214f53e6ddf13c0b33a
treec1d6c7c6eb8697e14969c5142db5cf580812ffc6
parent73f3ec7ac14d1a7c42be64faa2a607d0bbfa4adf
parent1290e774aa40f59b528f77d7ee240fac2dfa82a2
Merge branch 'master' of git@git.moblin.org:spectacle

Conflicts:
spectacle/spec/spec.tmpl
spectacle/spec/spec.tmpl