Merge branch 'master' of git@gitorious.org:meego-garage/garage-netbook-ui
authorBob Spencer <bob.spencer@intel.com>
Tue, 6 Apr 2010 07:24:19 +0000 (01:24 -0600)
committerBob Spencer <bob.spencer@intel.com>
Tue, 6 Apr 2010 07:24:19 +0000 (01:24 -0600)
commit0c9d4b7d1d4326c3eb27aafdebc5adf268c7146a
treecc881c39cd265c777d0f378f31a569c051ff7028
parente09384ea737c644bb45452c4673f5e74bfc83e74
parent9c99c8f53f8b709d7483a9b25d116942a2b8972c
Merge branch 'master' of git@gitorious.org:meego-garage/garage-netbook-ui

Conflicts:
mainwindow.cpp
mainwindow.h
mainwindow.cpp
mainwindow.h