Merge branch 'devel'
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 25 Oct 2012 11:27:22 +0000 (14:27 +0300)
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Thu, 25 Oct 2012 11:27:22 +0000 (14:27 +0300)
commit2ad76e94883bb329db0f5557cc25f21056eaaabd
tree7079496f9fac866e9fe2681bf7791b1b9b74bc16
parent8e5626fffd9a59ed8768b1b0dbec8935e83bbeb3
parent3ee2f9372e9dac5427ccc921e7e09fe0a9a70d30
Merge branch 'devel'