Merge remote-tracking branch 'canonical/next'master
commit5172974e75f30bd7050b99ff2e6849501008ec44
authorEric Merritt <ericbmerritt@gmail.com>
Thu, 17 May 2012 19:25:43 +0000 (17 14:25 -0500)
committerEric Merritt <ericbmerritt@gmail.com>
Thu, 17 May 2012 19:26:09 +0000 (17 14:26 -0500)
tree8548523c97557fda489bac7f467453f16920ba20
parentb0df56842dd3ca8c7c8cda3affce3e86c9924326
parente16a89f9953f7fd13412b8a5ffab9220abc295f2
Merge remote-tracking branch 'canonical/next'

* canonical/next:
  Version bump 4.1.1
  fix a nasty bug in app generation

Signed-off-by: Eric Merritt <ericbmerritt@gmail.com>